@zat-design/sisyphus-react 3.7.1 → 3.7.2-beta.10

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

@@ -24,9 +24,10 @@ import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
 import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
+import { getDefaultProps } from '../../utils/getDefaultProps';
 import ListChanged from './ListChanged';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -78,6 +79,7 @@ var RenderField = function RenderField(_ref) {
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
+  var _valueType = valueType;
   var _disabled = false;
   var isCell = mode === 'cell';
   if (isCell) {
@@ -102,11 +104,18 @@ var RenderField = function RenderField(_ref) {
   };
   // 行参数
   var rowParams = [currentValue, rowData, options];
-  if (typeof isEditable === 'function') {
-    isEditable = isEditable.apply(void 0, rowParams);
-    setTimeout(function () {
-      !isEditable && form.validateFields([cellName]);
-    }, 100);
+  // required & rules & fieldProps & disabled & valueType 函数化处理
+  if (isFunction(required)) {
+    _required = required.apply(void 0, rowParams);
+  }
+  if (isFunction(fieldProps)) {
+    _fieldProps = fieldProps.apply(void 0, rowParams);
+  }
+  if (isFunction(rules)) {
+    _rules = rules.apply(void 0, rowParams);
+  }
+  if (isFunction(valueType)) {
+    _valueType = valueType.apply(void 0, rowParams);
   }
   // 获取最终的disabled
   _disabled = getDisabled({
@@ -117,6 +126,12 @@ var RenderField = function RenderField(_ref) {
     columnFieldProps: _fieldProps,
     params: rowParams
   });
+  if (typeof isEditable === 'function') {
+    isEditable = isEditable.apply(void 0, rowParams);
+    setTimeout(function () {
+      !isEditable && form.validateFields([cellName]);
+    }, 100);
+  }
   // 是否只读文本
   var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !isEditing || getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -130,15 +145,6 @@ var RenderField = function RenderField(_ref) {
   // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   var baseName = isView ? name : namePath;
   var TargetComponent;
-  if (isFunction(required)) {
-    _required = required.apply(void 0, rowParams);
-  }
-  if (isFunction(fieldProps)) {
-    _fieldProps = fieldProps.apply(void 0, rowParams);
-  }
-  if (isFunction(rules)) {
-    _rules = rules.apply(void 0, rowParams);
-  }
   // 设置校验规则
   var internalRule = useRules({
     names: names,
@@ -154,11 +160,17 @@ var RenderField = function RenderField(_ref) {
   });
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = _objectSpread({}, _fieldProps);
+  var defaultProps = getDefaultProps({
+    name: name,
+    namePath: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
+    type: column === null || column === void 0 ? void 0 : column.type,
+    fieldProps: column === null || column === void 0 ? void 0 : column.fieldProps
+  });
   // 允许formItem的属性放在column最外层
-  var _formItemProps = _objectSpread(_objectSpread({}, resetProps), internalRule);
+  var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
-    valueType = 'switch';
+    _valueType = 'switch';
   }
   /**
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
@@ -166,7 +178,7 @@ var RenderField = function RenderField(_ref) {
    */
   var defaultTransform = function defaultTransform() {
     var types = ['DatePicker', 'RangePicker'];
-    if (!valueType && types.includes(type)) {
+    if (!_valueType && types.includes(type)) {
       var _transformMap$type;
       return transformMap === null || transformMap === void 0 ? void 0 : (_transformMap$type = transformMap[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(transformMap, _fieldProps || {});
     }
@@ -179,18 +191,18 @@ var RenderField = function RenderField(_ref) {
   var valueTypeTransform = useCallback(function () {
     var _fieldProps3;
     // 不存在valueType返回空
-    if (!valueType) {
+    if (!_valueType) {
       return {};
     }
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
-      valueType = 'switch';
+      _valueType = 'switch';
     }
     var params = _objectSpread(_objectSpread({}, column), {}, {
       mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
-    return isFunction(valueTypeMap[valueType]) ? valueTypeMap[valueType](params) : {};
-  }, [valueType]);
+    return isFunction(valueTypeMap[_valueType]) ? valueTypeMap[_valueType](params) : {};
+  }, [_valueType]);
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -221,7 +233,7 @@ var RenderField = function RenderField(_ref) {
     }
     var namesStr = [].concat(_toConsumableArray(baseName), [index, dataIndex]);
     var transform = {};
-    if (valueType) {
+    if (_valueType) {
       transform = valueTypeTransform();
     }
     return transformNames(_objectSpread(_objectSpread({}, _formItemProps), transform), form, names, namesStr, type);
@@ -501,7 +513,7 @@ var RenderField = function RenderField(_ref) {
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,
-      valueType: valueType,
+      valueType: _valueType,
       isView: isView
     }
   });
@@ -530,55 +542,65 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty({}, className, className));
-  var FormItem = null;
-  var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
-  if (originalValues) {
-    FieldComponent = _jsx(ListChanged, {
-      name: cellName,
-      names: names,
-      namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
-      rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
-      originalName: originalName,
-      originalNames: originalNames,
-      originalValues: originalValues,
-      form: form,
-      equalWith: equalWith,
-      type: type,
-      onChange: _onChange,
+  var getFieldItem = function getFieldItem() {
+    var _componentProps;
+    var FormItem = null;
+    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
+    if (originalValues) {
+      FieldComponent = _jsx(ListChanged, {
+        name: cellName,
+        names: names,
+        namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),
+        rowKeyPath: [].concat(_toConsumableArray(baseName), [index, 'rowKey']),
+        originalName: originalName,
+        originalNames: originalNames,
+        originalValues: originalValues,
+        form: form,
+        equalWith: equalWith,
+        type: type,
+        onChange: _onChange,
+        children: FieldComponent
+      });
+    }
+    if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
+      FieldComponent = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+        children: FieldComponent
+      }));
+    }
+    FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
+      validateFirst: true
+    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+      className: _className,
+      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
+    })) : _jsx(Container, {
+      viewEmpty: viewEmpty
     });
-  }
-  if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
-    FieldComponent = _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
-      children: FieldComponent
-    }));
-  }
-  FormItem = TargetComponent ? _jsx(_Form.Item, _objectSpread(_objectSpread({
-    validateFirst: true
-  }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
-    className: _className,
-    name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: FieldComponent
-  })) : _jsx(Container, {
-    viewEmpty: viewEmpty
-  });
-  if (type === 'FormList') {
-    FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
-      name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-    }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
-      children: function children(fields, operation, meta) {
-        return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
-          otherProps: otherProps,
-          fields: fields,
-          operation: operation,
-          meta: meta
-        }));
-      }
-    }));
-  }
+    if (type === 'FormList') {
+      FormItem = _jsx(_Form.List, _objectSpread(_objectSpread({
+        name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
+      }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+        children: function children(fields, operation, meta) {
+          return _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+            otherProps: otherProps,
+            fields: fields,
+            operation: operation,
+            meta: meta
+          }));
+        }
+      }));
+    }
+    return FormItem;
+  };
   return _jsx(FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: FormItem
+    children: _formItemProps.shouldUpdate ? _jsx(_Form.Item, {
+      noStyle: true,
+      shouldUpdate: _formItemProps.shouldUpdate,
+      children: function children() {
+        return getFieldItem();
+      }
+    }) : getFieldItem()
   });
 };
 export default RenderField;

package/es/ProEditTable/propsType.d.ts

@@ -96,7 +96,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     names?: NamePath[];
     cache?: boolean;
     isEditable?: boolean | RequiredFn<T>;
-    valueType?: ProFormValueType;
+    valueType?: ProFormValueType | ((text?: any, record?: any, options?: OptionsProps) => ProFormValueType);
     tooltip?: string | ({
         icon?: string | ReactNode;
     } & TooltipProps);

package/es/ProEditTable/utils/getDefaultProps.d.ts

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/es/ProEditTable/utils/getDefaultProps.js

@@ -0,0 +1,32 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import { get, isEqual } from 'lodash';
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _namePath = _toConsumableArray(namePath).splice(2, namePath.length - 1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var _get, _get$map, _get2, _get2$map;
+        var preListValue = (_get = get(preValues, name)) === null || _get === void 0 ? void 0 : (_get$map = _get.map) === null || _get$map === void 0 ? void 0 : _get$map.call(_get, function (item) {
+          return get(item, _namePath);
+        });
+        var curListValue = (_get2 = get(curValues, name)) === null || _get2 === void 0 ? void 0 : (_get2$map = _get2.map) === null || _get2$map === void 0 ? void 0 : _get2$map.call(_get2, function (item) {
+          return get(item, _namePath);
+        });
+        return !isEqual(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+export var getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
@@ -40,6 +40,7 @@ var ComRender = function ComRender(props) {
     getValueProps = props.getValueProps,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
+    valueType = props.valueType,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
   var mergedGetValueProps = getValueProps || function (val) {
@@ -51,6 +52,7 @@ var ComRender = function ComRender(props) {
   var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
+      valueType: valueType,
       type: type
     }),
     children: Com

package/es/ProForm/components/combination/Group/utils.js

@@ -87,7 +87,7 @@ export var getReactiveProps = function getReactiveProps(params) {
     component = params.component,
     fieldProps = params.fieldProps,
     name = params.name;
-  var values = form.getFieldsValue(namePath || undefined);
+  var values = namePath ? form.getFieldValue(namePath) : form.getFieldsValue();
   var _disabled = isFunction(disabled) ? disabled(values, {
     form: form,
     index: index,
@@ -182,7 +182,8 @@ export var useTransformColumns = function useTransformColumns(params) {
       mode = _ref.mode,
       onChange = _ref.onChange,
       onFieldChange = _ref.onFieldChange,
-      comDisabled = _ref.disabled;
+      comDisabled = _ref.disabled,
+      onBlur = _ref.onBlur;
     var _disabled = disabled || comDisabled;
     var columnName = names ? names[index] : [].concat(name, index);
     // 响应式字段改变后的回调
@@ -192,7 +193,13 @@ export var useTransformColumns = function useTransformColumns(params) {
         if ((current === null || current === void 0 ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
           timerRef.current[index] = setTimeout(function () {
-            form.resetFields([columnName]);
+            if (names) {
+              form.resetFields([columnName]);
+            }
+            if (!names && (value === null || value === void 0 ? void 0 : value.length)) {
+              value[index] = null;
+              form.setFieldValue(columnName, _toConsumableArray(value));
+            }
           }, 200);
         } else {
           clearInterval(timerRef.current[index]);
@@ -261,6 +268,19 @@ export var useTransformColumns = function useTransformColumns(params) {
         }
       }
     };
+    var handleBlur = function handleBlur() {
+      if (!onBlur) return;
+      var values = form.getFieldValue(namePath);
+      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+        args[_key2] = arguments[_key2];
+      }
+      onBlur === null || onBlur === void 0 ? void 0 : onBlur(args[0], values, {
+        index: outerIndex,
+        namePath: namePath,
+        form: form,
+        option: args === null || args === void 0 ? void 0 : args[1]
+      });
+    };
     return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
       name: columnName
     }, reactiveProps), {}, {
@@ -268,6 +288,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,
+        onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]
       })
     });

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

@@ -441,36 +441,25 @@ var Render = function Render(props) {
         children: child
       });
     }
-    var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+    return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
-    var formItem = orgFormItem;
-    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
-    if (_otherFormItemProps.shouldUpdate) {
-      formItem =
-      // 空标签防止气泡不显示
-      _jsx(_Fragment, {
-        children: _jsx(_Form.Item, {
-          shouldUpdate: _otherFormItemProps.shouldUpdate,
-          noStyle: true,
-          children: function children() {
-            return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
-              // @ts-ignore
-              _internalItemRender: internalItemRender,
-              className: _className,
-              children: child
-            }));
-          }
-        })
-      });
-    }
-    return formItem;
   };
   var FormItem = _jsxs(_Fragment, {
-    children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
+    children: [_otherFormItemProps.shouldUpdate ?
+    // 空标签防止气泡不显示
+    _jsx(_Fragment, {
+      children: _jsx(_Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return renderItem();
+        }
+      })
+    }) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
       return _jsx(_Form.Item, {
         hidden: true,
         name: name,

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

@@ -5,6 +5,7 @@ import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
 import Render from './Render';
+import { getDefaultProps } from '../../utils/getDefaultProps';
 import * as componentMap from '../index';
 import { isSelect } from '../../utils';
 import { FieldProvider } from '../../utils/useFieldProps';
@@ -76,8 +77,9 @@ var RenderFields = function RenderFields(props) {
       otherFormItemProps = _objectWithoutProperties(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
+    var defaultProps = getDefaultProps(column);
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, formItemProps), otherFormItemProps), {}, {
+    var _formItemProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
       clearNotShow: clearNotShow
     });

package/es/ProForm/components/render/propsType.d.ts

@@ -34,11 +34,11 @@ import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
-interface ExtendType {
+interface ExtendType extends Omit<RuleObject, 'type'> {
     type?: ValidateKey | RegExpKey;
     message?: string;
 }
-export type ProRule = RuleObject | ExtendType;
+export type ProRule = ExtendType;
 /**
  * percent 百分比 permillage 千分比 amount 金额
  */

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

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/es/ProForm/utils/getDefaultProps.js

@@ -0,0 +1,31 @@
+import { get, isEqual } from 'lodash';
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _listName = namePath.slice(0, -1);
+      var _namePath = name.slice(1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var preListValue = get(preValues, _listName).map(function (item) {
+          return get(item, _namePath);
+        });
+        var curListValue = get(curValues, _listName).map(function (item) {
+          return get(item, _namePath);
+        });
+        return !isEqual(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+export var getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

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

@@ -1,5 +1,5 @@
 export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
-    rules: any;
+    rules?: any[];
     label: any;
     isSelect: any;
     names: any;

package/es/ProForm/utils/rulesCreator.js

@@ -14,35 +14,38 @@ var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, value
 };
 export var rulesCreator = function rulesCreator(_ref) {
   var _result;
-  var rules = _ref.rules,
+  var _ref$rules = _ref.rules,
+    rules = _ref$rules === void 0 ? [] : _ref$rules,
     label = _ref.label,
     isSelect = _ref.isSelect,
     names = _ref.names,
     required = _ref.required;
   var message = "".concat(isSelect ? "".concat(locale.ProForm.selectPlaceHolder) : "".concat(locale.ProForm.inputPlaceholder)).concat(locale.ProForm.ruleText).concat(isString(label) ? label : '');
   var result = [];
-  result = rules.map(function (ruleItem) {
-    var rule = _objectSpread({}, ruleItem);
-    if (rule instanceof Object && 'type' in rule) {
-      if (Object.keys(regExp).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!isNullValue(value) && !regExp[rule.type].test(value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
-      }
-      if (Object.keys(validate).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!isNullValue(value) && !validate[rule.type](value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
+  if (Array.isArray(rules)) {
+    result = rules.map(function (ruleItem) {
+      var rule = _objectSpread({}, ruleItem);
+      if (rule instanceof Object && 'type' in rule) {
+        if (Object.keys(regExp).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!isNullValue(value) && !regExp[rule.type].test(value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
+        if (Object.keys(validate).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!isNullValue(value) && !validate[rule.type](value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
       }
-    }
-    return rule;
-  });
+      return rule;
+    });
+  }
   if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
     var customRequired = {
       validator: function validator(rules, value) {

package/es/ProForm/utils/useRules.js

@@ -14,7 +14,7 @@ var useRules = function useRules(props) {
     type = props.type;
   var _label = isString(label) ? label : '';
   var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-    return 'required' in rule;
+    return rule.required === true;
   }));
   var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
     return item === true;

package/es/ProForm/utils/valueType.js

@@ -18,7 +18,7 @@ var transformRatio = function transformRatio(_ref) {
     return {
       normalize: function normalize(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {};
         }
@@ -26,7 +26,7 @@ var transformRatio = function transformRatio(_ref) {
       },
       getValueProps: function getValueProps(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {
             value: []

package/es/ProSelect/index.js

@@ -281,7 +281,8 @@ export var ProSelect = function ProSelect(props, ref) {
       value: props.value,
       dataSource: selectList,
       labelInValue: labelInValue,
-      fieldNames: fieldNames
+      fieldNames: fieldNames,
+      mode: selectProps.mode
     });
   }
   return _jsx("div", {

package/es/ProSelect/utils/index.d.ts

@@ -1,10 +1,4 @@
 /**
  * 返回当前组件可以显示的数据源
  */
-export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, }: {
-    otherProps: any;
-    value: any;
-    dataSource: any;
-    labelInValue: any;
-    fieldNames: any;
-}) => any;
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, mode, }: any) => any;