@zat-design/sisyphus-react 3.4.5 → 3.4.6-beta.10

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

@@ -292,58 +292,64 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFinish = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
-      var _data, flag, res;
+      var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) {
+            if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
               _context2.next = 4;
               break;
             }
             _antd.message.error(_locale.default.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
-            _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
+            nextSelectedRows = selectedRows;
+            if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
+              nextSelectedRows = data.filter(function (item) {
+                return selectedRowKeys.includes(item[valueKey]);
+              });
+            }
+            record = isMultiple ? nextSelectedRows : (_nextSelectedRows2 = nextSelectedRows) === null || _nextSelectedRows2 === void 0 ? void 0 : _nextSelectedRows2[0];
             if (!isMultiple) {
               // @ts-ignore
-              _data.value = _data[valueKey];
+              record.value = record[valueKey];
               // @ts-ignore
-              _data.label = _data[labelKey];
+              record.label = record[labelKey];
             }
             flag = true;
             if (!onOk) {
-              _context2.next = 12;
+              _context2.next = 14;
               break;
             }
-            _context2.next = 10;
-            return onOk(_data);
-          case 10:
+            _context2.next = 12;
+            return onOk(record);
+          case 12:
             res = _context2.sent;
             if (res !== null && res !== undefined) {
               // @ts-ignore
               flag = res;
             }
-          case 12:
+          case 14:
             if (flag) {
-              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
+              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
               // 更新内部展示值
               setState({
-                _value: _data,
-                options: (0, _lodash.isArray)(_data) ? _data : [_data]
+                _value: record,
+                options: (0, _lodash.isArray)(record) ? record : [record]
               });
               handleClose();
             }
             return _context2.abrupt("return", flag);
-          case 16:
-            _context2.prev = 16;
+          case 18:
+            _context2.prev = 18;
             _context2.t0 = _context2["catch"](0);
-            console.log('error', _context2.t0);
-          case 19:
+            console.warn('error', _context2.t0);
+          case 21:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[0, 16]]);
+      }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
       return _ref7.apply(this, arguments);
@@ -424,7 +430,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
-      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data2, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -455,15 +461,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
-              if (_data2) {
+              _data = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
+              if (_data) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
-                  onChange(_data2);
+                  onChange(_data);
                 }
                 // 更新内部展示值
                 setState({
-                  _value: _data2,
+                  _value: _data,
                   isInit: false,
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
@@ -490,7 +496,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var getDefaultOneValues = /*#__PURE__*/function () {
     var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
-      var queryBean, page, params, res, _list2, list, _res$data3, _data3, nextSelectRowKeys;
+      var queryBean, page, params, res, _list2, list, _res$data3, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -514,18 +520,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               } else {
                 list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               }
-              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              _data2 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
-                onChange(_data3);
+                onChange(_data2);
               } else {
-                onChange(isMultiple ? _data3.map(function (item) {
+                onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
-                }) : _data3[valueKey]);
+                }) : _data2[valueKey]);
               }
               // 更新内部展示值
               setState({
-                _value: _data3,
+                _value: _data2,
                 isInit: false,
                 selectedRows: list,
                 selectedRowKeys: nextSelectRowKeys
@@ -593,6 +599,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           });
           nextState.selectedRows = value;
         }
+      } else if (value) {
+        console.log('value', value);
+        nextState.selectedRowKeys = [value];
       }
       setState(nextState);
     }
@@ -667,9 +676,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       labelInValue: labelInValue,
       dataSource: options,
       scrollFollowParent: false,
-      onClick: function onClick() {
-        // 没有值的时候，初始化点击默认查询前五十条
-        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
+      onFocus: function onFocus() {
+        if (useRequest) {
           var _useRequest$options9;
           var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams) || {};
           var params = withPagination ? {
@@ -752,6 +760,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       };
     }
   }, [value, isTooltip]);
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    setState({
+      options: tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource
+    });
+  }, [tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource]);
   // 当搜索条件只有一个时，且为输入框，默认设置suffix
   if ((formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) === 1 && (formColumns === null || formColumns === void 0 ? void 0 : (_formColumns$ = formColumns[0]) === null || _formColumns$ === void 0 ? void 0 : _formColumns$.type) === 'Input') {
     var _formColumns$2, _formColumns$3, _formColumns$3$fieldP;
@@ -797,6 +810,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         form: form,
         columns: formColumns,
         onFinish: handleSearch,
+        confirmLoading: loading,
         footer: (formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) > 1
       }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread3.default)({
         onRow: function onRow(record) {

package/lib/ProForm/components/combination/ProModalSelect/style/index.less

@@ -53,6 +53,20 @@
     }
   }
 
+  // 新加适用于 readonly false
+  .@{ant-prefix}-input-affix-wrapper {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    &.ant-input-affix-wrapper-status-error{
+       & + .@{ant-prefix}-btn{
+        border: 1px solid var(--ant-error-color);
+        >.viewSvg{
+          color: var(--ant-error-color);
+        }
+      }
+    }
+  }
+
   .pro-tree-modal-input-appoint {
     .@{ant-prefix}-input {
       border-top-left-radius: 0;
@@ -93,6 +107,15 @@
     fill: #c5c7cd;
   }
 
+  .@{ant-prefix}-select-status-error {
+    & + .@{ant-prefix}-btn{
+      border: 1px solid var(--ant-error-color);
+      >.viewSvg{
+        color: var(--ant-error-color);
+      }
+    }
+  }
+
   .@{ant-prefix}-input-group-addon {
     padding: 0px var(--zaui-space-size-sm, 8px);
     background-color: var(--zaui-base-bg, #ffffff);

package/lib/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -12,8 +12,8 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     separator?: any;
     isView?: boolean;
 };
-type Value = [Moment?, Moment?, boolean?];
-type ValueStr = [string?, string?, string?];
+type Value = [Moment?, Moment?, boolean?] | null;
+type ValueStr = [string?, string?, string?] | null;
 type HandleChange = (value: ValueStr | null, valueStr: Value | null) => void;
 declare const ProRangeLimit: React.FC<Props>;
 export default ProRangeLimit;

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

@@ -29,12 +29,16 @@ var useControlled = function useControlled(props) {
     var _props$value, _props$value2;
     var internalValue = [((_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value[0]) && (0, _moment.default)(props.value[0], props.format), ((_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2[1]) && (0, _moment.default)(props.value[1], props.format)];
     var handleChange = function handleChange(value, other) {
-      var _value = (0, _slicedToArray2.default)(value, 2),
-        start = _value[0],
-        end = _value[1];
-      if (props === null || props === void 0 ? void 0 : props.onChange) {
-        var valueStr = [start === null || start === void 0 ? void 0 : start.format(props.format), end === null || end === void 0 ? void 0 : end.format(props.format)];
-        props === null || props === void 0 ? void 0 : props.onChange(valueStr, value);
+      if (!value) {
+        props === null || props === void 0 ? void 0 : props.onChange(value, other);
+      } else {
+        var _value = (0, _slicedToArray2.default)(value, 2),
+          start = _value[0],
+          end = _value[1];
+        if (props === null || props === void 0 ? void 0 : props.onChange) {
+          var valueStr = [start === null || start === void 0 ? void 0 : start.format(props.format), end === null || end === void 0 ? void 0 : end.format(props.format)];
+          props === null || props === void 0 ? void 0 : props.onChange(valueStr, value);
+        }
       }
     };
     return [internalValue, handleChange];
@@ -98,6 +102,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
   }
   // 时间范围change
   var handleRangeChange = function handleRangeChange(date, dateStr) {
+    if (!date) {
+      onChange(date, dateStr);
+      return;
+    }
     var _ref4 = date || [],
       _ref5 = (0, _slicedToArray2.default)(_ref4, 2),
       start = _ref5[0],
@@ -110,20 +118,19 @@ var ProRangeLimit = function ProRangeLimit(props) {
   };
   // 长期选择框change
   var handleForeverChange = function handleForeverChange(e) {
-    var _start, _end;
     var foreverStr = e.target.checked ? 'Y' : 'N';
     var _ref8 = value || [],
       _ref9 = (0, _slicedToArray2.default)(_ref8, 2),
       start = _ref9[0],
       end = _ref9[1];
     if (e.target.checked) {
+      var _start, _end;
       start = start || (0, _moment.default)().startOf('day');
       end = foreverMoment;
+      onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
     } else {
-      start = undefined;
-      end = undefined;
+      onChange(null);
     }
-    onChange([start, end, e.target.checked], [(_start = start) === null || _start === void 0 ? void 0 : _start.format(format), (_end = end) === null || _end === void 0 ? void 0 : _end.format(format), foreverStr]);
   };
   return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
     compact: true,

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

@@ -11,8 +11,7 @@ export { default as SwitchCheckbox } from './base/SwitchCheckbox';
 export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
-export { default as ProCascader } from './base/ProCascader';
-export { default as ProAddressBar } from './combination/ProAddressBar';
+export { default as ProCascader } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

package/lib/ProForm/components/index.js

@@ -71,12 +71,6 @@ Object.defineProperty(exports, "ProAddress", {
     return _ProAddress.default;
   }
 });
-Object.defineProperty(exports, "ProAddressBar", {
-  enumerable: true,
-  get: function get() {
-    return _ProAddressBar.default;
-  }
-});
 Object.defineProperty(exports, "ProCascader", {
   enumerable: true,
   get: function get() {
@@ -234,8 +228,7 @@ var _SwitchCheckbox = _interopRequireDefault(require("./base/SwitchCheckbox"));
 var _TimePicker = _interopRequireDefault(require("./base/TimePicker"));
 var _FormList = _interopRequireDefault(require("./combination/FormList"));
 var _ProEditTable = _interopRequireDefault(require("../../ProEditTable"));
-var _ProCascader = _interopRequireDefault(require("./base/ProCascader"));
-var _ProAddressBar = _interopRequireDefault(require("./combination/ProAddressBar"));
+var _ProCascader = _interopRequireDefault(require("./combination/ProCascader"));
 var _ProCombination = _interopRequireDefault(require("./combination/ProCombination"));
 var _ProNumberRange = _interopRequireDefault(require("./combination/ProNumberRange"));
 var _ProModalSelect = _interopRequireDefault(require("./combination/ProModalSelect"));

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

@@ -224,7 +224,7 @@ var Render = function Render(props) {
     }
     _args[2].option = args[1];
     switch (type) {
-      case 'ProAddressBar':
+      case 'ProCascader':
         _args[2].selectedOptions = args[1];
         break;
       case 'DatePicker':
@@ -240,7 +240,7 @@ var Render = function Render(props) {
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleChange = function handleChange() {
-    var _otherFormItemProps$n3, _lastComponentProps$c2;
+    var _lastComponentProps$c2;
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
@@ -258,11 +258,11 @@ var Render = function Render(props) {
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
       return false;
     }
-    var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    // FormList 和 Group场景 对比值改变的话, 回显到表单上
-    if (inList) {
-      form.setFieldsValue(_args[1]);
-    }
+    // const inList = _otherFormItemProps?.namePath?.length;
+    // // FormList 和 Group场景 对比值改变的话, 回显到表单上
+    // if (inList) {
+    //   form.setFieldsValue(_args[1]);
+    // }
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
@@ -274,7 +274,7 @@ var Render = function Render(props) {
     // ProTreeSelect返回option
     if (['ProTree'].includes(type)) {
       var _args2, _args2$;
-      _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
+      _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args)));
   };
@@ -421,17 +421,21 @@ var Render = function Render(props) {
     var formItem = orgFormItem;
     // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
     if (_otherFormItemProps.shouldUpdate) {
-      formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-        shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true,
-        children: function children() {
-          return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
-            // @ts-ignore
-            _internalItemRender: internalItemRender,
-            className: _className,
-            children: child
-          }));
-        }
+      formItem =
+      // 空标签防止气泡不显示
+      (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+          shouldUpdate: _otherFormItemProps.shouldUpdate,
+          noStyle: true,
+          children: function children() {
+            return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+              // @ts-ignore
+              _internalItemRender: internalItemRender,
+              className: _className,
+              children: child
+            }));
+          }
+        })
       });
     }
     // 不渲染tooltip
@@ -447,7 +451,8 @@ var Render = function Render(props) {
     });
     return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: title,
-      visible: changed ? undefined : false,
+      open: changed ? undefined : false,
+      // open={true}
       getPopupContainer: function getPopupContainer(target) {
         return target.parentElement;
       },

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

@@ -186,7 +186,10 @@ var RenderFields = function RenderFields(props) {
       hiddenNames: column.hiddenNames,
       colProps: _colProps,
       mode: componentProps.mode,
-      namePath: column.namePath
+      namePath: column.namePath,
+      listName: column.listName,
+      globalControl: globalControl,
+      formDisabled: formDisabled
     };
     if (outerClearNotShow !== false && show === false && (column === null || column === void 0 ? void 0 : column.name) && form.getFieldValue(column === null || column === void 0 ? void 0 : column.name)) {
       setTimeout(function () {

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

@@ -16,8 +16,7 @@ import { Props as TimePickerProps } from '../base/TimePicker';
 import { Props as SwitchProps } from '../base/Switch';
 import { Props as SwitchCheckboxProps } from '../base/SwitchCheckbox';
 import { Props as TextAreaProps } from '../base/TextArea';
-import { Props as ProCascaderProps } from '../base/ProCascader';
-import { AddressProps } from '../combination/ProAddressBar/propsType';
+import { ProCascaderProps } from '../combination/ProCascader/propsType';
 import { ProCombinationProps } from '../combination/ProCombination/propsType';
 import { ProModalSelectPropsType as ProModalSelectProps } from '../combination/ProModalSelect/propsType';
 import { ProNumberRangeProps } from '../combination/ProNumberRange/propsType';
@@ -123,8 +122,8 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     type?: 'TextArea';
     fieldProps?: FieldProps<TextAreaProps, Values, T>;
 } | {
-    type?: 'ProAddressBar';
-    fieldProps?: FieldProps<AddressProps, Values, T>;
+    type?: 'ProCascader';
+    fieldProps?: FieldProps<ProCascaderProps, Values, T>;
 } | {
     type?: 'ProCombination';
     fieldProps?: FieldProps<ProCombinationProps, Values, T>;
@@ -155,9 +154,6 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProUpload';
     fieldProps?: FieldProps<ProUploadProps, Values, T>;
-} | {
-    type?: 'ProCascader';
-    fieldProps?: FieldProps<ProCascaderProps<any, any[], any>, Values, T>;
 } | {
     type?: 'ProTree';
     fieldProps?: FieldProps<ProTreeProps, Values, T>;
@@ -212,6 +208,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     clearNotShow?: boolean;
     index?: number;
     namePath?: NamePath;
+    listName?: NamePath;
     /** 表单前缀信息 */
     before?: string | React.ReactNode;
     /** 表单后缀信息 */
@@ -220,7 +217,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/lib/ProForm/index.js

@@ -237,6 +237,10 @@ var ProForm = function ProForm(props, ref) {
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
+    scrollToFirstError: {
+      block: 'center',
+      behavior: 'smooth'
+    },
     children: (0, _jsxRuntime.jsxs)(_antd.Row, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       gutter: 24
     }, rowProps), {}, {
@@ -314,7 +318,7 @@ ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
 ProFormForward.useContextForms = _ProConfigProvider.useContextForms; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
-ProFormForward.ProAddressBar = _components.ProAddressBar;
+ProFormForward.ProCascader = _components.ProCascader;
 ProFormForward.ProCombination = _components.ProCombination;
 ProFormForward.ProNumberRange = _components.ProNumberRange;
 ProFormForward.ProModalSelect = _components.ProModalSelect;

package/lib/ProForm/propsType.d.ts

@@ -41,6 +41,9 @@ export interface ProFormOtherProps {
     required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
+    listName?: any[] | string | number;
+    globalControl?: boolean;
+    formDisabled?: boolean;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;

package/lib/ProForm/style/index.less

@@ -4,7 +4,7 @@
 @import '../components/base/TextArea/index.less';
 @import '../components/combination/FormList/style/index.less';
 @import '../components/combination/ProTimeLimit/style/index.less';
-@import '../components/combination/ProAddressBar/style/index.less';
+@import '../components/combination/ProCascader/style/index.less';
 @import '../components/combination/ProNumberRange/style/index.less';
 @import '../components/combination/ProModalSelect/style/index.less';
 @import '../components/combination/Group/style/index.less';
@@ -338,6 +338,7 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    width: 100%;
   }
 
   .full-form-item {

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

@@ -83,7 +83,12 @@ export declare const deleteForPath: (values: any, namePath: string | number | (s
  * @param value 选中值
  * @returns {}
  */
-export declare const findOptionByValue: (treeData: any[], value: string | number) => any;
+export declare const findOptionByValue: (treeData: any[], value: string | number, fieldNames: {
+    [key: string]: any;
+    label?: string;
+    value?: string;
+    children?: string;
+}) => any;
 /**
  * 对比依赖列表中的 值是否变更
  */

package/lib/ProForm/utils/index.js

@@ -59,7 +59,7 @@ var useControlled = exports.useControlled = function useControlled(props) {
 var isSelect = exports.isSelect = function isSelect(props) {
   var dataSource = props.dataSource,
     type = props.type;
-  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProAddressBar', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
+  return (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) || ['Select', 'ProSelect', 'ProEnum', 'DatePicker', 'RangePicker', 'ProCascader', 'ProTimeLimit', 'ProModalSelect', 'ProTreeModal', 'ProUpload', 'TimePicker'].includes(type);
 };
 /**
  * Input TextArea 移除前后空格
@@ -143,6 +143,9 @@ var filterInternalFields = exports.filterInternalFields = function filterInterna
   if ((values === null || values === void 0 ? void 0 : values._immutable) || _moment.default.isMoment(values)) {
     return nextValues;
   }
+  if (values instanceof File) {
+    return nextValues;
+  }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
       return filterInternalFields(item);
@@ -405,19 +408,19 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value) {
+var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
   for (var i = 0; i < (treeData === null || treeData === void 0 ? void 0 : treeData.length); i++) {
     var node = treeData[i];
-    if (node.value === value) {
-      return (0, _lodash.omit)(node, ['children']);
+    if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
+      return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = findOptionByValue(node.children, value);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
-        return (0, _lodash.omit)(foundNode, ['children']);
+        return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }

package/lib/ProForm/utils/useChanged.js

@@ -18,9 +18,8 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
     return (0, _lodash.get)(originalValues, name);
   }) : (0, _lodash.get)(originalValues, name);
   var notWatch = !equalWith && (!originalValues || originalValue === undefined);
-  if (notWatch) form = [];
-  var value = _antd.Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
+  var value = _antd.Form.useWatch(namesStr || name, form);
   var changed = (0, _diffOriginal.diffOriginal)({
     originalValue: originalValue,
     value: value,

package/lib/ProForm/utils/useForm.js

@@ -32,30 +32,43 @@ var useForm = exports.useForm = function useForm(originForm) {
         _key,
         values,
         _values,
+        _error$errorFields,
+        _error$errorFields$,
         _args = arguments;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            _context.prev = 0;
             for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               rest[_key - 1] = _args[_key];
             }
-            _context.next = 3;
+            _context.next = 4;
             return validateFields.apply(void 0, [nameList].concat(rest));
-          case 3:
+          case 4:
             values = _context.sent;
             if (!nameList) {
-              _context.next = 6;
+              _context.next = 7;
               break;
             }
             return _context.abrupt("return", values);
-          case 6:
+          case 7:
             _values = _getFieldsValue();
             return _context.abrupt("return", _values);
-          case 8:
+          case 11:
+            _context.prev = 11;
+            _context.t0 = _context["catch"](0);
+            if (_context.t0 && (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields)) {
+              form === null || form === void 0 ? void 0 : form.scrollToField(_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : (_error$errorFields$ = _error$errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
+                block: 'center',
+                behavior: 'smooth'
+              });
+            }
+            throw _context.t0;
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[0, 11]]);
     }));
     return function _validateFields(_x) {
       return _ref.apply(this, arguments);