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

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"));
@@ -29,7 +29,7 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
-var _ListChanged = _interopRequireDefault(require("./ListChanged"));
+var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -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
     }
   });
@@ -549,7 +554,7 @@ var RenderField = function RenderField(_ref) {
     var FormItem = null;
     var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
     if (originalValues) {
-      FieldComponent = (0, _jsxRuntime.jsx)(_ListChanged.default, {
+      FieldComponent = (0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
         names: names,
         namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),

package/lib/ProEditTable/components/RenderToolbar/index.d.ts

@@ -1,2 +1,2 @@
-declare const RenderToolbar: (config: any) => import("react/jsx-runtime").JSX.Element;
+declare const RenderToolbar: (config: any) => JSX.Element;
 export default RenderToolbar;

package/lib/ProEditTable/components/Summary/index.d.ts

@@ -8,5 +8,5 @@ interface SummaryProps<T = any> {
     };
     rowSelection: any;
 }
-declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => import("react/jsx-runtime").JSX.Element;
+declare const Summary: ({ data, summary, rowSelection, }: SummaryProps) => JSX.Element;
 export default Summary;

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/config.d.ts

@@ -9,7 +9,7 @@ export declare const defaultBtnNameMap: {
     custom: any;
 };
 export declare const iconMap: {
-    add: import("react/jsx-runtime").JSX.Element;
+    add: JSX.Element;
 };
 export declare const defaultSingleActionKeys: string[];
 export declare const defaultMultipleActionKeys: string[];

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/ProEditTable/utils/tools.js

@@ -14,14 +14,14 @@ var getRandom = exports.getRandom = function getRandom() {
 };
 // 深层次对比两个对象且取出来差异值
 var difference = exports.difference = function difference(object, base) {
-  var _changes = function changes(object, base) {
+  var changes = function changes(object, base) {
     return (0, _lodash.transform)(object, function (result, value, key) {
       if (!(0, _lodash.isEqual)(value, base[key])) {
-        result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? _changes(value, base[key]) : value;
+        result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? changes(value, base[key]) : value;
       }
     });
   };
-  return _changes(object, base);
+  return changes(object, base);
 };
 // 数组字段循环校验，解决validateFields无法批量校验的问题
 var customValidate = exports.customValidate = function customValidate(validateKeys, form, rowName) {

package/lib/ProEnum/components/Group.d.ts

@@ -6,5 +6,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
     allowClear?: boolean;
     button?: boolean;
 }
-declare const Group: (props: Props) => import("react/jsx-runtime").JSX.Element;
+declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/lib/ProEnum/components/Tag.d.ts

@@ -3,5 +3,5 @@ interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'
     fieldValue: string;
     fieldLabel: string;
 }
-declare const ProEnumTag: (props: Props) => import("react/jsx-runtime").JSX.Element;
+declare const ProEnumTag: (props: Props) => JSX.Element;
 export default ProEnumTag;

package/lib/ProEnum/index.d.ts

@@ -2,8 +2,8 @@ import useEnum from './hooks/useEnum';
 import { ProEnumProps } from './propsType';
 import './style/index.less';
 declare const ProEnum: {
-    (props: ProEnumProps): import("react/jsx-runtime").JSX.Element;
-    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
+    (props: ProEnumProps): JSX.Element;
+    getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
     useEnum: typeof useEnum;
 };
 export default ProEnum;

package/lib/ProEnum/index.js

@@ -26,7 +26,7 @@ var _getEnumLabel = _interopRequireDefault(require("./utils/getEnumLabel"));
 var _useEnum = _interopRequireDefault(require("./hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../locale"));
 require("./style/index.less");
-var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
+var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps", "isView"],
   _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 var ProEnum = function ProEnum(props) {
   var _enumProps$showCodeNa;
@@ -40,10 +40,11 @@ var ProEnum = function ProEnum(props) {
     onChange = props.onChange,
     transformResponse = props.transformResponse,
     otherProps = props.otherProps,
+    isView = props.isView,
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
-    isView = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -227,7 +228,7 @@ var ProEnum = function ProEnum(props) {
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
     _antd.message.error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
-    return;
+    // return;
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -272,7 +273,7 @@ var ProEnum = function ProEnum(props) {
     };
     return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
-  if (isView) {
+  if (_isView) {
     if (Array.isArray(value)) {
       return (0, _jsxRuntime.jsx)(_Container.default, {
         tooltip: true,

package/lib/ProEnum/style/index.less

@@ -19,7 +19,7 @@
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
     padding: var(--zaui-space-size-xs) 10px;
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     border-radius: var(--zaui-space-size-xs);
     cursor: pointer;
   }
@@ -29,7 +29,7 @@
     background-color: var(--zaui-brand);
   }
   &-tag-item-disabled {
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     pointer-events: none;
   }
 
@@ -90,12 +90,16 @@
 
     .pro-enum-group-item-disabled {
       color: rgba(0, 0, 0, 0.25);
-      background: #f5f5f5;
+      background: var(--zaui-disabled-bg);
       cursor: not-allowed;
     }
   }
 
   &-group-root-disabled {
-    opacity: 0.7;
+    color: #bfbfbf;
+
+    .pro-enum-group-item {
+      background: var(--zaui-disabled-bg);
+    }
   }
 }

package/lib/ProEnum/utils/eventCenter.js

@@ -10,7 +10,7 @@ var SimpleEventCenter = /*#__PURE__*/function () {
     this.events = void 0;
     this.events = new Map();
   }
-  return (0, _createClass2.default)(SimpleEventCenter, [{
+  (0, _createClass2.default)(SimpleEventCenter, [{
     key: "subscribe",
     value: function subscribe(eventName, callback) {
       if (!this.events.has(eventName)) {
@@ -37,5 +37,6 @@ var SimpleEventCenter = /*#__PURE__*/function () {
       }
     }
   }]);
+  return SimpleEventCenter;
 }(); // 将 eventCenter 实例添加到 window 对象上
 window.eventCenter = new SimpleEventCenter();

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

@@ -1,2 +1,2 @@
-declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
+declare const getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => JSX.Element;
 export default getEnumLabel;

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/base/Input/index.d.ts

@@ -1,3 +1,3 @@
 import { IProps } from './propsType';
-declare const Input: (props: IProps) => import("react/jsx-runtime").JSX.Element;
+declare const Input: (props: IProps) => JSX.Element;
 export default Input;

package/lib/ProForm/components/combination/Container/index.js

@@ -16,11 +16,12 @@ var _ProCollapse = _interopRequireDefault(require("../../../../ProLayout/compone
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var Container = function Container(props) {
   var children = props.children,
-    otherProps = props.otherProps,
     className = props.className,
     container = props.container,
     show = props.show,
-    clearNotShow = props.clearNotShow;
+    clearNotShow = props.clearNotShow,
+    diffConfig = props.diffConfig,
+    otherProps = props.otherProps;
   var _ref = _ProForm.default.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
@@ -45,7 +46,8 @@ var Container = function Container(props) {
   var childRender = function childRender() {
     var child = (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
       columns: _children,
-      form: form
+      form: form,
+      diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
       return (0, _jsxRuntime.jsx)(_ProCollapse.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {

package/lib/ProForm/components/combination/Container/propsType.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RowProps } from 'antd';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+import { ProColumnProps, ProFormOtherProps, DiffConfigProps } from '../../../propsType';
 export interface ContainerProps {
     children?: ProColumnProps[];
     otherProps?: ProFormOtherProps;
@@ -8,5 +8,6 @@ export interface ContainerProps {
     className?: string;
     container?: string | React.ReactNode;
     show?: boolean | (() => boolean);
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
 }

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/components/combination/ProCascader/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ProCascaderProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
 export default _default;

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -29,9 +29,9 @@ var defaultFieldNames = {
   value: 'code',
   children: 'children'
 };
-var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
+var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
+    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -96,7 +96,7 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
+    var result = isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
     return (0, _index.transformDataName)(result, fieldNames);
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
@@ -131,7 +131,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -196,7 +196,7 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var _findSelectedOptions = function findSelectedOptions(options, value) {
+  var findSelectedOptions = function findSelectedOptions(options, value) {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var _value = value !== null && value !== void 0 ? value : [];
     // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
@@ -215,7 +215,7 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
+        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
@@ -224,7 +224,7 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = (0, _react.useMemo)(function () {
-    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
   }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);

package/lib/ProForm/components/combination/ProNumberRange/index.js

@@ -95,7 +95,9 @@ var ProNumberRange = function ProNumberRange(props) {
   });
   // 查看模式
   if (isView || props.isView) {
-    if ((0, _lodash.isEmpty)(value)) {
+    if ((0, _lodash.isEmpty)(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
+      return typeof item !== 'number';
+    }))) {
       return viewEmpty;
     }
     switch (valueType) {

package/lib/ProForm/components/old/InputRange/index.d.ts

@@ -12,5 +12,5 @@ export interface InputRangeProps {
     isPositiveInteger?: boolean;
     precision?: number;
 }
-declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => import("react/jsx-runtime").JSX.Element;
+declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
 export default InputRange;

package/lib/ProForm/components/old/InputWithSuffix/index.d.ts

@@ -1,3 +1,3 @@
 import { comPropsType } from './propsTypes';
-declare const InputWithSuffix: (props: comPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const InputWithSuffix: (props: comPropsType) => JSX.Element;
 export default InputWithSuffix;

package/lib/ProForm/components/old/ProAddress/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
@@ -23,5 +24,5 @@ export declare const transferAddressInfoToRegion: () => {
         };
     };
 };
-export declare function ProAddress({ ...props }: ProAddressPropsType): import("react/jsx-runtime").JSX.Element;
+export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
 export default ProAddress;

package/lib/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
-export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;
+export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;