@zat-design/sisyphus-react 3.7.2 → 3.7.3-beta.2

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

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

@@ -79,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) {
@@ -103,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({
@@ -118,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,
@@ -131,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,
@@ -165,7 +170,7 @@ var RenderField = function RenderField(_ref) {
   var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
-    valueType = 'switch';
+    _valueType = 'switch';
   }
   /**
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
@@ -173,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 || {});
     }
@@ -186,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) {
@@ -228,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);
@@ -508,7 +513,7 @@ var RenderField = function RenderField(_ref) {
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,
-      valueType: valueType,
+      valueType: _valueType,
       isView: isView
     }
   });

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.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import { get, isEqual } from 'lodash';
 var defaultPropsMap = {
   ProSelect: function ProSelect(props) {
@@ -9,7 +10,7 @@ var defaultPropsMap = {
     var defaultProps = {};
     // formList场景传入列表过滤时
     if (filterInList && namePath && name) {
-      var _namePath = namePath.slice(2, namePath.length - 1);
+      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) {

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

@@ -5,7 +5,7 @@ interface EnumRes {
     [key: string]: any;
 }
 export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
-export declare function setEnumData(storage: StorageType, cacheKey: string, data: Object): void;
+export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): DataOption[];
 export declare function isObject(obj: any): boolean;
 export declare function mergeCacheData(storage: string, code: string, cacheKey: string, responseData: any): void;

package/es/ProEnum/utils/index.js

@@ -13,6 +13,10 @@ export function getEnumData(storage, cacheKey, baseEnumStorage) {
   }
 }
 export function setEnumData(storage, cacheKey, data) {
+  var _Object$keys;
+  if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
+    return false;
+  }
   if (storage === 'localStorage') {
     window.localStorage.setItem(cacheKey, JSON.stringify(data));
   } else if (storage === 'sessionStorage') {

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

@@ -1,4 +1,4 @@
-import { isEqualWith, isFunction } from 'lodash';
+import { isEqualWith } from 'lodash';
 import React from 'react';
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
@@ -26,8 +26,9 @@ export var memoWith = function memoWith(pre, next) {
     if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }
-    if (isFunction(objValue) && isFunction(othValue)) {
-      return true;
-    }
+    // 移除解决formlist函数里不更新问题
+    // if (isFunction(objValue) && isFunction(othValue)) {
+    //   return true;
+    // }
   });
 };

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,13 +182,14 @@ 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);
     // 响应式字段改变后的回调
     var changedCallback = function changedCallback(lastDependency, current) {
       // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false) {
+      if (clearNotShow !== false && names) {
         if ((current === null || current === void 0 ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
           timerRef.current[index] = setTimeout(function () {
@@ -237,10 +238,12 @@ export var useTransformColumns = function useTransformColumns(params) {
         args[_key] = arguments[_key];
       }
       newValue = valueFromEventWrapper(column, args);
-      if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
+      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
         var _transform$normalize;
+        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+      } else if (normalize) {
         // @ts-ignore
-        newValue = (transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
+        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
       }
       internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
       var values = form.getFieldValue(namePath);
@@ -267,6 +270,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), {}, {
@@ -274,6 +290,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/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/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

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useImperativeHandle, useState, forwardRef } from 'react';
@@ -53,10 +53,11 @@ export var ProSelect = function ProSelect(props, ref) {
     onChange = props.onChange,
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
+    getValueProps = props.getValueProps,
     isViewPro = props.isView,
     selectProps = _objectWithoutProperties(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
-  var value = props.value;
+  var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
   var _ref2 = ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
@@ -216,6 +217,7 @@ export var ProSelect = function ProSelect(props, ref) {
     return props.children;
   };
   var handleChange = function handleChange(value, option) {
+    var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(function (item) {
@@ -225,14 +227,14 @@ export var ProSelect = function ProSelect(props, ref) {
         });
       }
       if (labelInValue) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getValueObject(value), option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
       } else {
-        onChange === null || onChange === void 0 ? void 0 : onChange(value, option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option);
       }
     } else if (!selectProps.mode && labelInValue) {
-      onChange(getValueObject(value), option);
+      onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
     }
   };
   /**
@@ -278,10 +280,11 @@ export var ProSelect = function ProSelect(props, ref) {
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = getSelectList({
       otherProps: otherProps,
-      value: props.value,
+      value: value,
       dataSource: selectList,
       labelInValue: labelInValue,
-      fieldNames: fieldNames
+      fieldNames: fieldNames,
+      mode: selectProps.mode
     });
   }
   return _jsx("div", {

package/es/ProSelect/propsType.d.ts

@@ -46,6 +46,10 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     onSearch?: (value: string, useRequest: Result<any, any>) => void;
     /** 自定义展示 */
     optionRender?: (value: DataOption) => string | ReactNode;
+    /** 用来转换修改value值 和 getValueProps配合使用  */
+    getChangeValue?: (value: DataOption) => any;
+    /** 用来转换传入的value值 getChangeValue配合使用 */
+    getValueProps?: (value: DataOption) => any;
 }
 export interface ProSelectAction {
     /** 实例方法、根据 code ｜ code[] 批量获取数据 */

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;

package/es/ProSelect/utils/index.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 /* eslint-disable no-restricted-syntax */
 import _ from 'lodash';
@@ -8,7 +9,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     value = _ref.value,
     dataSource = _ref.dataSource,
     labelInValue = _ref.labelInValue,
-    fieldNames = _ref.fieldNames;
+    fieldNames = _ref.fieldNames,
+    mode = _ref.mode;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -27,9 +29,13 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     } finally {
       _iterator.f();
     }
-    selectValues.push(result);
+    if (mode === 'multiple') {
+      selectValues = [].concat(_toConsumableArray(selectValues), _toConsumableArray(result));
+    } else {
+      selectValues.push(result);
+    }
   });
-  var diffList = _.difference(selectValues, [value]);
+  var diffList = _.difference(selectValues, mode === 'multiple' ? value : [value]);
   return dataSource.filter(function (item) {
     return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
@@ -42,7 +48,8 @@ export var getSelectList = function getSelectList(_ref2) {
     value = _ref2.value,
     dataSource = _ref2.dataSource,
     labelInValue = _ref2.labelInValue,
-    fieldNames = _ref2.fieldNames;
+    fieldNames = _ref2.fieldNames,
+    mode = _ref2.mode;
   if (!otherProps) {
     return null;
   }
@@ -59,6 +66,7 @@ export var getSelectList = function getSelectList(_ref2) {
     value: value,
     dataSource: dataSource,
     labelInValue: labelInValue,
-    fieldNames: fieldNames
+    fieldNames: fieldNames,
+    mode: mode
   });
 };

package/es/ProUpload/index.js

@@ -71,7 +71,7 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
     fieldNames = props.fieldNames,
     isConfirmDelete = props.isConfirmDelete,
     residueProps = _objectWithoutProperties(props, _excluded);
-  var isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var isView = (props === null || props === void 0 ? void 0 : props.isView) || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var sensor = useSensor(PointerSensor, {
     activationConstraint: {
       distance: 10

package/es/ProUpload/propsType.d.ts

@@ -195,6 +195,11 @@ export interface ProUploadProps {
      */
     isConfirmDelete?: boolean;
     id?: string;
+    /**
+     * @description 查看模式
+     * @default    false
+     */
+    isView?: boolean;
 }
 export interface DraggableUploadListItemProps {
     file: UploadFile<any>;

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

@@ -17,7 +17,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _valueType = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
+var _valueType2 = _interopRequireDefault(require("../../../ProForm/utils/valueType"));
 var _transform = _interopRequireDefault(require("../../utils/transform"));
 var _tools = require("../../utils/tools");
 var componentMap = _interopRequireWildcard(require("../../../ProForm/components"));
@@ -86,6 +86,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) {
@@ -110,11 +111,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 ((0, _lodash.isFunction)(required)) {
+    _required = required.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(fieldProps)) {
+    _fieldProps = fieldProps.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(rules)) {
+    _rules = rules.apply(void 0, rowParams);
+  }
+  if ((0, _lodash.isFunction)(valueType)) {
+    _valueType = valueType.apply(void 0, rowParams);
   }
   // 获取最终的disabled
   _disabled = (0, _tools.getDisabled)({
@@ -125,6 +133,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 || (0, _tools.getDisabled)({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -138,15 +152,6 @@ var RenderField = function RenderField(_ref) {
   // 只读文本时，采用当前formItem的name，单行编辑时，使用生成的虚拟的name
   var baseName = isView ? name : namePath;
   var TargetComponent;
-  if ((0, _lodash.isFunction)(required)) {
-    _required = required.apply(void 0, rowParams);
-  }
-  if ((0, _lodash.isFunction)(fieldProps)) {
-    _fieldProps = fieldProps.apply(void 0, rowParams);
-  }
-  if ((0, _lodash.isFunction)(rules)) {
-    _rules = rules.apply(void 0, rowParams);
-  }
   // 设置校验规则
   var internalRule = (0, _useRules.default)({
     names: names,
@@ -172,7 +177,7 @@ var RenderField = function RenderField(_ref) {
   var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
-    valueType = 'switch';
+    _valueType = 'switch';
   }
   /**
    * 针对一些特殊类型，基于formItem的normalize与getValueProps进行默认值类型转换
@@ -180,7 +185,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 _transform.default === null || _transform.default === void 0 ? void 0 : (_transformMap$type = _transform.default[type]) === null || _transformMap$type === void 0 ? void 0 : _transformMap$type.call(_transform.default, _fieldProps || {});
     }
@@ -193,18 +198,18 @@ var RenderField = function RenderField(_ref) {
   var valueTypeTransform = (0, _react.useCallback)(function () {
     var _fieldProps3;
     // 不存在valueType返回空
-    if (!valueType) {
+    if (!_valueType) {
       return {};
     }
     // SwitchCheckbox默认YN, 兼容已有组件
     if (type === 'SwitchCheckbox') {
-      valueType = 'switch';
+      _valueType = 'switch';
     }
     var params = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
       mode: (_fieldProps3 = _fieldProps) === null || _fieldProps3 === void 0 ? void 0 : _fieldProps3.mode
     });
-    return (0, _lodash.isFunction)(_valueType.default[valueType]) ? _valueType.default[valueType](params) : {};
-  }, [valueType]);
+    return (0, _lodash.isFunction)(_valueType2.default[_valueType]) ? _valueType2.default[_valueType](params) : {};
+  }, [_valueType]);
   if ((_names = names) === null || _names === void 0 ? void 0 : _names.length) {
     // 支持names配置，临时生成对应的formItem，用来存储单个对应的值
     names = names.map(function (key) {
@@ -235,7 +240,7 @@ var RenderField = function RenderField(_ref) {
     }
     var namesStr = [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]);
     var transform = {};
-    if (valueType) {
+    if (_valueType) {
       transform = valueTypeTransform();
     }
     return (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _formItemProps), transform), form, names, namesStr, type);
@@ -515,7 +520,7 @@ var RenderField = function RenderField(_ref) {
       name: cellName,
       listName: cellName,
       viewEmpty: viewEmpty,
-      valueType: valueType,
+      valueType: _valueType,
       isView: isView
     }
   });

package/lib/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/lib/ProEditTable/utils/getDefaultProps.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDefaultProps = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var defaultPropsMap = {
   ProSelect: function ProSelect(props) {
@@ -15,7 +17,7 @@ var defaultPropsMap = {
     var defaultProps = {};
     // formList场景传入列表过滤时
     if (filterInList && namePath && name) {
-      var _namePath = namePath.slice(2, namePath.length - 1);
+      var _namePath = (0, _toConsumableArray2.default)(namePath).splice(2, namePath.length - 1);
       defaultProps.shouldUpdate = function (preValues, curValues) {
         var _get, _get$map, _get2, _get2$map;
         var preListValue = (_get = (0, _lodash.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) {

package/lib/ProEnum/utils/index.d.ts

@@ -5,7 +5,7 @@ interface EnumRes {
     [key: string]: any;
 }
 export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
-export declare function setEnumData(storage: StorageType, cacheKey: string, data: Object): void;
+export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): DataOption[];
 export declare function isObject(obj: any): boolean;
 export declare function mergeCacheData(storage: string, code: string, cacheKey: string, responseData: any): void;

package/lib/ProEnum/utils/index.js

@@ -26,6 +26,10 @@ function getEnumData(storage, cacheKey, baseEnumStorage) {
   }
 }
 function setEnumData(storage, cacheKey, data) {
+  var _Object$keys;
+  if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
+    return false;
+  }
   if (storage === 'localStorage') {
     window.localStorage.setItem(cacheKey, JSON.stringify(data));
   } else if (storage === 'sessionStorage') {

package/lib/ProForm/components/combination/FormList/utils.js

@@ -33,8 +33,9 @@ var memoWith = exports.memoWith = function memoWith(pre, next) {
     if ( /*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
       return true;
     }
-    if ((0, _lodash.isFunction)(objValue) && (0, _lodash.isFunction)(othValue)) {
-      return true;
-    }
+    // 移除解决formlist函数里不更新问题
+    // if (isFunction(objValue) && isFunction(othValue)) {
+    //   return true;
+    // }
   });
 };

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

@@ -15,7 +15,7 @@ var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/ren
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType"];
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: _ConfirmWrapper.default,
@@ -48,6 +48,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 = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
   var mergedGetValueProps = getValueProps || function (val) {
@@ -59,6 +60,7 @@ var ComRender = function ComRender(props) {
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
+      valueType: valueType,
       type: type
     }),
     children: Com

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

@@ -94,7 +94,7 @@ var getReactiveProps = exports.getReactiveProps = function getReactiveProps(para
     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 = (0, _lodash.isFunction)(disabled) ? disabled(values, {
     form: form,
     index: index,
@@ -189,13 +189,14 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
       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);
     // 响应式字段改变后的回调
     var changedCallback = function changedCallback(lastDependency, current) {
       // 清值防抖  多次刷新时以最后一次为准
-      if (clearNotShow !== false) {
+      if (clearNotShow !== false && names) {
         if ((current === null || current === void 0 ? void 0 : current.show) === false) {
           clearInterval(timerRef.current[index]);
           timerRef.current[index] = setTimeout(function () {
@@ -244,10 +245,12 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         args[_key] = arguments[_key];
       }
       newValue = valueFromEventWrapper(column, args);
-      if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
+      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
         var _transform$normalize;
+        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+      } else if (normalize) {
         // @ts-ignore
-        newValue = (transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
+        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
       }
       internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
       var values = form.getFieldValue(namePath);
@@ -274,6 +277,19 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         }
       }
     };
+    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 (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
       name: columnName
     }, reactiveProps), {}, {
@@ -281,6 +297,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,
+        onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]
       })
     });

package/lib/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/lib/ProForm/utils/rulesCreator.js

@@ -22,35 +22,38 @@ var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, value
 };
 var rulesCreator = exports.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.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0, _lodash.isString)(label) ? label : '');
   var result = [];
-  result = rules.map(function (ruleItem) {
-    var rule = (0, _objectSpread2.default)({}, ruleItem);
-    if (rule instanceof Object && 'type' in rule) {
-      if (Object.keys(_utils.regExp).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
-      }
-      if (Object.keys(_utils.validate).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!(0, _index.isNullValue)(value) && !_utils.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 = (0, _objectSpread2.default)({}, ruleItem);
+      if (rule instanceof Object && 'type' in rule) {
+        if (Object.keys(_utils.regExp).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
+        if (Object.keys(_utils.validate).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!(0, _index.isNullValue)(value) && !_utils.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/lib/ProForm/utils/valueType.js

@@ -25,7 +25,7 @@ var transformRatio = function transformRatio(_ref) {
     return {
       normalize: function normalize(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {};
         }
@@ -33,7 +33,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/lib/ProSelect/index.js

@@ -21,7 +21,7 @@ var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
 var _utils = require("./utils");
 require("./index.less");
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _selectProps$showCode, _locale$ProSelect;
@@ -54,10 +54,11 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     onChange = props.onChange,
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
+    getValueProps = props.getValueProps,
     isViewPro = props.isView,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
-  var value = props.value;
+  var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
@@ -217,6 +218,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     return props.children;
   };
   var handleChange = function handleChange(value, option) {
+    var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(function (item) {
@@ -226,14 +228,14 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
         });
       }
       if (labelInValue) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getValueObject(value), option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
       } else {
-        onChange === null || onChange === void 0 ? void 0 : onChange(value, option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option);
       }
     } else if (!selectProps.mode && labelInValue) {
-      onChange(getValueObject(value), option);
+      onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
     }
   };
   /**
@@ -279,10 +281,11 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = (0, _utils.getSelectList)({
       otherProps: otherProps,
-      value: props.value,
+      value: value,
       dataSource: selectList,
       labelInValue: labelInValue,
-      fieldNames: fieldNames
+      fieldNames: fieldNames,
+      mode: selectProps.mode
     });
   }
   return (0, _jsxRuntime.jsx)("div", {

package/lib/ProSelect/propsType.d.ts

@@ -46,6 +46,10 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     onSearch?: (value: string, useRequest: Result<any, any>) => void;
     /** 自定义展示 */
     optionRender?: (value: DataOption) => string | ReactNode;
+    /** 用来转换修改value值 和 getValueProps配合使用  */
+    getChangeValue?: (value: DataOption) => any;
+    /** 用来转换传入的value值 getChangeValue配合使用 */
+    getValueProps?: (value: DataOption) => any;
 }
 export interface ProSelectAction {
     /** 实例方法、根据 code ｜ code[] 批量获取数据 */

package/lib/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;

package/lib/ProSelect/utils/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSelectList = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _lodash = _interopRequireDefault(require("lodash"));
 /* eslint-disable no-restricted-syntax */
@@ -16,7 +17,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     value = _ref.value,
     dataSource = _ref.dataSource,
     labelInValue = _ref.labelInValue,
-    fieldNames = _ref.fieldNames;
+    fieldNames = _ref.fieldNames,
+    mode = _ref.mode;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -35,9 +37,13 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     } finally {
       _iterator.f();
     }
-    selectValues.push(result);
+    if (mode === 'multiple') {
+      selectValues = [].concat((0, _toConsumableArray2.default)(selectValues), (0, _toConsumableArray2.default)(result));
+    } else {
+      selectValues.push(result);
+    }
   });
-  var diffList = _lodash.default.difference(selectValues, [value]);
+  var diffList = _lodash.default.difference(selectValues, mode === 'multiple' ? value : [value]);
   return dataSource.filter(function (item) {
     return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
@@ -50,7 +56,8 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
     value = _ref2.value,
     dataSource = _ref2.dataSource,
     labelInValue = _ref2.labelInValue,
-    fieldNames = _ref2.fieldNames;
+    fieldNames = _ref2.fieldNames,
+    mode = _ref2.mode;
   if (!otherProps) {
     return null;
   }
@@ -67,6 +74,7 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
     value: value,
     dataSource: dataSource,
     labelInValue: labelInValue,
-    fieldNames: fieldNames
+    fieldNames: fieldNames,
+    mode: mode
   });
 };

package/lib/ProUpload/index.js

@@ -78,7 +78,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     fieldNames = props.fieldNames,
     isConfirmDelete = props.isConfirmDelete,
     residueProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var isView = (props === null || props === void 0 ? void 0 : props.isView) || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var sensor = (0, _core.useSensor)(_core.PointerSensor, {
     activationConstraint: {
       distance: 10

package/lib/ProUpload/propsType.d.ts

@@ -195,6 +195,11 @@ export interface ProUploadProps {
      */
     isConfirmDelete?: boolean;
     id?: string;
+    /**
+     * @description 查看模式
+     * @default    false
+     */
+    isView?: boolean;
 }
 export interface DraggableUploadListItemProps {
     file: UploadFile<any>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.7.2",
+  "version": "3.7.3-beta.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -102,6 +102,7 @@
     "eslint": "7.10.0",
     "eslint-config-za": "2.1.0",
     "eslint-plugin-babel": "5.3.0",
+    "eslint-plugin-complexity": "^1.0.2",
     "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jsx-a11y": "6.2.3",
     "eslint-plugin-react": "7.16.0",