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

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

@@ -226,7 +226,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':
@@ -242,7 +242,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];
     }
@@ -260,11 +260,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(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_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 () {
@@ -276,7 +276,7 @@ var Render = function Render(props) {
     // ProTreeSelect返回option
     if (['ProTree'].includes(type)) {
       var _args2, _args2$;
-      _args[2].option = 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 = 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(_toConsumableArray(_args)));
   };
@@ -423,17 +423,21 @@ var Render = function Render(props) {
     var formItem = orgFormItem;
     // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
     if (_otherFormItemProps.shouldUpdate) {
-      formItem = _jsx(_Form.Item, {
-        shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true,
-        children: function children() {
-          return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
-            // @ts-ignore
-            _internalItemRender: internalItemRender,
-            className: _className,
-            children: child
-          }));
-        }
+      formItem =
+      // 空标签防止气泡不显示
+      _jsx(_Fragment, {
+        children: _jsx(_Form.Item, {
+          shouldUpdate: _otherFormItemProps.shouldUpdate,
+          noStyle: true,
+          children: function children() {
+            return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
+              // @ts-ignore
+              _internalItemRender: internalItemRender,
+              className: _className,
+              children: child
+            }));
+          }
+        })
       });
     }
     // 不渲染tooltip
@@ -449,7 +453,8 @@ var Render = function Render(props) {
     });
     return _jsx(_Tooltip, {
       title: title,
-      visible: changed ? undefined : false,
+      open: changed ? undefined : false,
+      // open={true}
       getPopupContainer: function getPopupContainer(target) {
         return target.parentElement;
       },

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

@@ -178,7 +178,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/es/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/es/ProForm/index.js

@@ -18,7 +18,7 @@ import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
-import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
+import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
@@ -236,6 +236,10 @@ var ProForm = function ProForm(props, ref) {
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,
+    scrollToFirstError: {
+      block: 'center',
+      behavior: 'smooth'
+    },
     children: _jsxs(_Row, _objectSpread(_objectSpread({
       gutter: 24
     }, rowProps), {}, {
@@ -313,7 +317,7 @@ ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
 ProFormForward.useContextForms = useContextForms; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
-ProFormForward.ProAddressBar = ProAddressBar;
+ProFormForward.ProCascader = ProCascader;
 ProFormForward.ProCombination = ProCombination;
 ProFormForward.ProNumberRange = ProNumberRange;
 ProFormForward.ProModalSelect = ProModalSelect;

package/es/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/es/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/es/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/es/ProForm/utils/index.js

@@ -43,7 +43,7 @@ export var useControlled = function useControlled(props) {
 export var 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 移除前后空格
@@ -127,6 +127,9 @@ export var filterInternalFields = function filterInternalFields(values) {
   if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
     return nextValues;
   }
+  if (values instanceof File) {
+    return nextValues;
+  }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
       return filterInternalFields(item);
@@ -389,19 +392,19 @@ export var deleteForPath = function deleteForPath(values, namePath) {
  * @param value 选中值
  * @returns {}
  */
-export var findOptionByValue = function findOptionByValue(treeData, value) {
+export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if (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 omit(node, ['children']);
+    if (node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || 'value'] === value) {
+      return 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 omit(foundNode, ['children']);
+        return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
     }
   }

package/es/ProForm/utils/useChanged.js

@@ -13,9 +13,8 @@ export var useChanged = function useChanged(_ref) {
     return get(originalValues, name);
   }) : get(originalValues, name);
   var notWatch = !equalWith && (!originalValues || originalValue === undefined);
-  if (notWatch) form = [];
-  var value = _Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
+  var value = _Form.useWatch(namesStr || name, form);
   var changed = diffOriginal({
     originalValue: originalValue,
     value: value,

package/es/ProForm/utils/useForm.js

@@ -26,30 +26,43 @@ export var useForm = function useForm(originForm) {
         _key,
         values,
         _values,
+        _error$errorFields,
+        _error$errorFields$,
         _args = arguments;
       return _regeneratorRuntime().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);

package/es/ProForm/utils/useListChanged.js

@@ -80,10 +80,8 @@ export var useListChanged = function useListChanged(params) {
   }) : undefined;
   var noChange = !equalWith && (!originalValues || originalValue === undefined);
   var _form = form;
-  // @ts-ignore
-  if (notWatch) _form = [];
-  var value = _Form.useWatch(namePath, _form);
   if (notWatch || noChange) return [false];
+  var value = _Form.useWatch(namePath, _form);
   var changed = diffOriginal({
     value: value,
     originalValue: originalValue,

package/es/ProIcon/config/index.d.ts

@@ -8,10 +8,12 @@ export declare const themeMap: {
     '#00BC70': string[];
     '#FF8C16': string[];
     '#A00F20': string[];
+    '#31AF96': string[];
 };
 export declare const themeFillMap: {
     '#006AFF': string[];
     '#00BC70': string[];
     '#FF8C16': string[];
     '#A00F20': string[];
+    '#31AF96': string[];
 };

package/es/ProIcon/config/index.js

@@ -260,12 +260,14 @@ export var themeMap = {
   '#006AFF': ['#ADDDFF', '#5FB3D8', '#4181FF'],
   '#00BC70': ['#FFFFFF', '#54DFA7', '#00BC70'],
   '#FF8C16': ['#FFFFFF', '#FFA74E', '#FF8C17'],
-  '#A00F20': ['#FFFFFF', '#E47B7B', '#A00E20']
+  '#A00F20': ['#FFFFFF', '#E47B7B', '#A00E20'],
+  '#31AF96': ['#5FD8C7', '#5FD8C7', '#31AF96']
 };
 // 双色icon预设
 export var themeFillMap = {
   '#006AFF': ['none', '#87F1FC', 'black', '#4181FF'],
   '#00BC70': ['none', '#05FFEC', 'black', '#00BC70'],
   '#FF8C16': ['none', '#FED736', 'black', '#FF8C17'],
-  '#A00F20': ['none', '#FD8357', 'black', '#A00E20']
+  '#A00F20': ['none', '#FD8357', 'black', '#A00E20'],
+  '#31AF96': ['none', '#BBF392', 'black', '#31AF96']
 };