@zat-design/sisyphus-react 3.4.3 → 3.4.4

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

@@ -9,12 +9,13 @@ exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _icons = require("@ant-design/icons");
 var _ahooks = require("ahooks");
+var _umi = require("umi");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _reactSvg = require("react-svg");
@@ -50,7 +51,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     isTooltip = props.isTooltip,
     searchForm = props.searchForm,
     defaultOne = props.defaultOne,
-    restInputProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var contentForm = _antd.Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -103,6 +104,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOff: false,
       visible: false,
       open: false,
+      options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || [],
       selectedRows: [],
       selectedRowKeys: []
     }),
@@ -113,6 +115,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onOff = _useSetState2$.onOff,
     visible = _useSetState2$.visible,
     open = _useSetState2$.open,
+    options = _useSetState2$.options,
     _selectedRows = _useSetState2$.selectedRows,
     _selectedRowKeys = _useSetState2$.selectedRowKeys,
     setState = _useSetState2[1];
@@ -121,13 +124,23 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     form = _Form$useForm2[0];
   var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
   var selectedRowKeys = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || _selectedRowKeys;
+  var _useUmiRequest = (0, _umi.useRequest)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+      manual: true,
+      onSuccess: function onSuccess(data) {
+        var list = withPagination ? data === null || data === void 0 ? void 0 : data.list : data;
+        setState({
+          options: list
+        });
+      }
+    })),
+    run = _useUmiRequest.run;
   var _useRequestList = (0, _useRequestList2.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
-    }, (0, _objectSpread2.default)({
+    }, (0, _objectSpread3.default)({
       manual: true,
-      ready: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || visible || defaultOne
+      ready: ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList.data,
     loading = _useRequestList.loading,
@@ -159,13 +172,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return data;
     }
     if (Object.prototype.toString.call(data) === '[object Object]') {
-      return handleFormat((0, _objectSpread2.default)((0, _objectSpread2.default)({}, data), {}, {
+      return handleFormat((0, _objectSpread3.default)((0, _objectSpread3.default)({}, data), {}, {
         value: data[valueKey],
         label: data[labelKey]
       }));
     }
     return (0, _lodash.isArray)(data) ? data === null || data === void 0 ? void 0 : (_data$map = data.map(function (item) {
-      return handleFormat((0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      return handleFormat((0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, {
         value: item[valueKey],
         label: item[labelKey]
       }));
@@ -208,14 +221,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   };
-  // 清空表单项
-  var handleClearValue = function handleClearValue() {
-    onChange(undefined, {});
-    setState({
-      _value: undefined,
-      selectedRowKeys: [],
-      selectedRows: []
-    });
+  var handleSelectValue = function handleSelectValue(val, option) {
+    onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
@@ -318,7 +325,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? _data : getNextValues(_data), _data);
               // 更新内部展示值
               setState({
-                _value: _data
+                _value: _data,
+                options: (0, _lodash.isArray)(_data) ? _data : [_data]
               });
               handleClose();
             }
@@ -347,7 +355,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             return form.validateFields();
           case 2:
             values = _context3.sent;
-            onSearch((0, _objectSpread2.default)((0, _objectSpread2.default)({}, values), {}, {
+            onSearch((0, _objectSpread3.default)((0, _objectSpread3.default)({}, values), {}, {
               d: Date.now()
             }));
           case 4:
@@ -360,7 +368,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return _ref8.apply(this, arguments);
     };
   }();
-  var _rowSelection = (0, _objectSpread2.default)({
+  var _rowSelection = (0, _objectSpread3.default)({
     type: type,
     onChange: function onChange(rowKeys, rows) {
       setState({
@@ -423,12 +431,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 10;
               break;
             }
-            queryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
-            page = (0, _objectSpread2.default)({
+            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
+            page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
             }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.page);
-            params = withPagination ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, page), {}, {
+            params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
@@ -482,12 +490,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = (0, _objectSpread2.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
-            page = (0, _objectSpread2.default)({
+            queryBean = (0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
+            page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
             }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
-            params = withPagination ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, page), {}, {
+            params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
@@ -587,9 +595,30 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [onOff, visible, value]);
   (0, _react.useEffect)(function () {
     if (value && !visible && isInit) {
-      getInitValues();
+      if (readOnly) {
+        // 加定时器 修复依赖数据同步更新未取到问题
+        setTimeout(function () {
+          var _useRequest$options7, _useRequest$options8;
+          var initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
+          if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
+            var _contentForm$getField2;
+            initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField2 = contentForm.getFieldsValue) === null || _contentForm$getField2 === void 0 ? void 0 : _contentForm$getField2.call(contentForm));
+          }
+          var params = withPagination ? {
+            pageNum: 1,
+            pageSize: 50,
+            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
+          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+          run(params);
+          setState({
+            isInit: false
+          });
+        }, 300);
+      } else {
+        getInitValues();
+      }
     }
-  }, [value, visible, isInit]);
+  }, [value, visible, isInit, useRequest]);
   (0, _react.useEffect)(function () {
     if (!value) {
       if (defaultOne) {
@@ -602,59 +631,79 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (labelInValue && _value && !(0, _lodash.isEqual)(value, _value)) {
-      setState({
-        _value: value,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
-    }
-    if (!labelInValue && (_value === null || _value === void 0 ? void 0 : _value[valueKey]) && !(0, _lodash.isEqual)(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
-      setState({
-        _value: value,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
+    if (!readOnly) {
+      if (labelInValue && _value && !(0, _lodash.isEqual)(value, _value)) {
+        setState({
+          _value: value,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
+      if (!labelInValue && (_value === null || _value === void 0 ? void 0 : _value[valueKey]) && !(0, _lodash.isEqual)(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
+        setState({
+          _value: value,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
     }
   }, [value, _value]);
-  var defaultAddonAfter = (0, _jsxRuntime.jsxs)("div", {
-    className: "pro-enum-input-addonAfter",
-    children: [value && !disabled && (0, _jsxRuntime.jsx)("span", {
-      className: "close-icon",
-      children: (0, _jsxRuntime.jsx)(_icons.CloseOutlined, {
-        onClick: handleClearValue
-      })
-    }), (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
-      className: "viewSvg",
-      src: _view.default,
-      onClick: handleClick
-    })]
-  });
-  var forceAddonAfterRender = function forceAddonAfterRender() {
-    if (isView || disabled) {
-      return;
-    }
-    if (addonAfter) {
-      return (0, _jsxRuntime.jsx)("div", {
-        onClick: handleClick,
-        children: addonAfter
-      });
-    }
-    return defaultAddonAfter;
-  };
   // 加个中间状态Input
-  var initRender = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [(0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)({
+  var initRender = (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
+    style: {
+      width: '100%'
+    },
+    block: true,
+    children: [readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread3.default)({
+      value: value,
+      onChange: handleSelectValue,
+      disabled: disabled,
+      fieldNames: fieldNames,
+      showCodeName: showCodeName,
+      labelInValue: labelInValue,
+      dataSource: options,
+      scrollFollowParent: false,
+      onClick: function onClick() {
+        // 没有值的时候，初始化点击默认查询前五十条
+        if (!value && isInit || !(options === null || options === void 0 ? void 0 : options.length)) {
+          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 ? {
+            pageNum: 1,
+            pageSize: 50,
+            queryBean: queryBean
+          } : queryBean;
+          run(params);
+          setState({
+            isInit: false
+          });
+        }
+      },
+      onSearch: (0, _lodash.debounce)(function (val) {
+        var _useRequest$options10;
+        var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, (0, _defineProperty2.default)({}, labelKey, val));
+        var params = withPagination ? {
+          pageNum: 1,
+          pageSize: 50,
+          queryBean: queryBean
+        } : queryBean;
+        run(params);
+      }, 800),
+      style: {
+        width: isView || disabled ? '100%' : 'calc(100% - 30px)'
+      }
+    }, (0, _lodash.omit)(restProps, ['otherProps']))) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
       value: viewText,
-      readOnly: readOnly,
-      onClick: readOnly ? handleClick : undefined,
       onChange: handleChangeValue,
       disabled: disabled,
-      addonAfter: forceAddonAfterRender(),
-      autoComplete: "off"
-    }, (0, _lodash.omit)(restInputProps, ['otherProps']))), (0, _jsxRuntime.jsx)(_antd.Input, {
-      type: "hidden",
-      value: value
+      autoComplete: "off",
+      allowClear: true
+    }, (0, _lodash.omit)(restProps, ['otherProps']))), isView || disabled ? null : (0, _jsxRuntime.jsx)(_antd.Button, {
+      icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
+        className: "viewSvg",
+        src: _view.default,
+        onClick: handleClick
+      })
     })]
   });
   if (customRender && /*#__PURE__*/_react.default.isValidElement(customRender)) {
@@ -731,7 +780,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       open: open,
       title: viewText,
       children: initRender
-    }) : initRender, (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    }) : initRender, (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread3.default)((0, _objectSpread3.default)({
       showType: "Modal",
       title: title,
       onOk: handleFinish,
@@ -745,7 +794,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         columns: formColumns,
         onFinish: handleSearch,
         footer: (formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) > 1
-      }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread2.default)({
+      }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread3.default)({
         onRow: function onRow(record) {
           return {
             onClick: function onClick() {

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

@@ -1,4 +1,4 @@
-import { FormInstance, InputProps, ModalProps } from 'antd';
+import { FormInstance, InputProps, SelectProps, ModalProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 import React from 'react';
 import { ProColumnProps } from '../../render/propsType';
@@ -43,5 +43,5 @@ interface ProModalPropsType {
     showCodeName?: boolean;
     searchForm?: FormInstance;
 }
-export declare type ProModalSelectPropsType = InputProps & ProModalPropsType;
+export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
 export {};

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

@@ -88,7 +88,7 @@
   }
 
   .viewSvg {
-    height: 24px;
+    height: 20px;
     cursor: pointer;
     fill: #c5c7cd;
   }

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

@@ -9,7 +9,7 @@
     border-right: 0px;
     border-left: 0px;
     pointer-events: none;
-    &.ant-input[disabled] {
+    &.@{ant-prefix}-input[disabled] {
       background: #fff !important;
     }
   }

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

@@ -12,7 +12,7 @@ var _lodash = require("lodash");
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _index = _interopRequireDefault(require("../../index"));
-var _excluded = ["onChange", "children", "confirm"];
+var _excluded = ["onChange", "children", "confirm", "otherProps"];
 var defaultConfirmProps = {
   title: '操作提示',
   content: '确定要修改该字段吗？'
@@ -21,6 +21,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var onChange = props.onChange,
     children = props.children,
     confirm = props.confirm,
+    otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ProForm$useFieldProp = _index.default.useFieldProps(),
     form = _ProForm$useFieldProp.form;
@@ -29,7 +30,12 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       other[_key - 1] = arguments[_key];
     }
     var _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
-    var confirmProps = (0, _lodash.isFunction)(confirm) ? confirm(form.getFieldsValue()) : confirm;
+    var confirmProps = (0, _lodash.isFunction)(confirm) ? confirm(value, form.getFieldsValue(), {
+      option: other[0],
+      form: form,
+      namePath: otherProps.namePath,
+      index: otherProps.index
+    }) : confirm;
     if (confirmProps === true) {
       _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
         onOk: function onOk() {

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

@@ -152,9 +152,11 @@ var Render = function Render(props) {
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
-  }, internalRule, labelRequired || _required ? {
-    required: labelRequired || _required
-  } : null, otherProps.isView && !requiredOnView ? {
+  }, internalRule, {
+    required: typeof labelRequired === 'boolean' ? labelRequired : _required || (rules === null || rules === void 0 ? void 0 : rules.some(function (item) {
+      return item === null || item === void 0 ? void 0 : item.required;
+    }))
+  }, otherProps.isView && !requiredOnView ? {
     required: false
   } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
   (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
@@ -220,12 +222,8 @@ var Render = function Render(props) {
     if (valueType) {
       _args[2].transformValue = form.getFieldValue(_otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : _otherFormItemProps.name) || undefined;
     }
+    _args[2].option = args[1];
     switch (type) {
-      case 'ProSelect':
-      case 'ProModalSelect':
-      case 'ProEnum':
-        _args[2].option = args[1];
-        break;
       case 'ProAddressBar':
         _args[2].selectedOptions = args[1];
         break;
@@ -242,7 +240,7 @@ var Render = function Render(props) {
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleChange = function handleChange() {
-    var _lastComponentProps$c2;
+    var _otherFormItemProps$n3, _lastComponentProps$c2;
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
@@ -260,6 +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]);
+    }
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {

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

@@ -16,7 +16,7 @@ interface Props<T = any> {
     originalValues?: ProFormProps<T>['originalValues'];
     clearNotShow?: boolean;
     requiredOnView?: boolean;
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     originalDiffTip?: boolean;
     globalControl?: boolean;
 }

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

@@ -52,12 +52,12 @@ interface ControlProps {
 /**
  * 扩展函数的参数
  */
-type FunctionArgs<Values> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
+type FunctionArgs<Values, R = any> = (value: any, record: any, { form, index, namePath, option, selectedOptions, dateString, }: {
     form: FormInstance<Values>;
     index?: number;
     namePath?: NamePath;
     [key: string]: any;
-}) => any;
+}) => R;
 type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
@@ -206,7 +206,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: (originValue: any, currentValue: any) => boolean;
-    required?: boolean | ReactiveFunction<Values, boolean>;
+    required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
     clearNotShow?: boolean;
@@ -220,7 +220,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     extra?: string | React.ReactNode;
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
-    confirm?: boolean | ModalFuncProps | ((values: Values) => boolean | ModalFuncProps);
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/lib/ProForm/index.js

@@ -27,7 +27,7 @@ var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
 var ProForm = function ProForm(props, ref) {
-  var _forms$formKey, _localStorage;
+  var _forms$formKey, _localStorage, _ref;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -50,8 +50,7 @@ var ProForm = function ProForm(props, ref) {
     expandOpenChange = props.expandOpenChange,
     _props$viewEmpty = props.viewEmpty,
     viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
-    _props$labelAlign = props.labelAlign,
-    labelAlign = _props$labelAlign === void 0 ? 'left' : _props$labelAlign,
+    labelAlign = props.labelAlign,
     labelWidth = props.labelWidth,
     onValuesChange = props.onValuesChange,
     onFinish = props.onFinish,
@@ -232,9 +231,9 @@ var ProForm = function ProForm(props, ref) {
       }
     },
     className: cls,
-    form: form,
-    labelAlign: labelAlign
+    form: form
   }, formProps), config), otherProps), {}, {
+    labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,
     initialValues: _initialValues,

package/lib/ProForm/propsType.d.ts

@@ -38,7 +38,7 @@ export interface ProFormOtherProps {
     colProps: ColProps;
     disabled: boolean;
     show?: boolean | (() => boolean);
-    required?: boolean | (() => boolean);
+    required?: boolean | boolean[] | (() => boolean | boolean[]);
     mode?: string;
     namePath?: any[] | string | number;
 }
@@ -70,7 +70,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
-    required?: boolean;
+    required?: boolean | boolean[];
     originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {

package/lib/ProForm/style/index.less

@@ -132,7 +132,8 @@
         }
       }
 
-      .ant-form-item-control:has(.ant-switch-handle, .ant-checkbox-wrapper-in-form-item) {
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
         background: @zaui-contract-bg;
         border-radius: 4px;
       }
@@ -140,13 +141,13 @@
       // 地址组件
       .@{ant-prefix}-form-item-control-input-content {
         & > .pro-address {
-          .ant-select-selector,
-          .ant-input-affix-wrapper,
-          .ant-input-disabled {
+          .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-input-affix-wrapper,
+          .@{ant-prefix}-input-disabled {
             background: @zaui-contract-bg;
           }
         }
-        & > .ant-input-group {
+        & > .@{ant-prefix}-input-group {
           .forever-checkbox {
             background: @zaui-contract-bg;
           }
@@ -346,4 +347,21 @@
   .delete-icon {
     width: 18px;
   }
+  .pro-form-list-tool-btn {
+    margin-left: 8px;
+    padding: 0;
+    cursor: pointer;
+    .anticon {
+      color: var(--zaui-text-weak, #a0a0a0);
+      font-size: 16px;
+      vertical-align: middle;
+    }
+  }
+  .pro-form-list-mode-block{
+    .pro-collapse-content{
+      .@{ant-prefix}-row{
+        width: auto;
+      }
+    }
+  }
 }

package/lib/ProForm/utils/diffOriginal.js

@@ -5,49 +5,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.diffOriginal = void 0;
-var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var extractValue = function extractValue(obj, path) {
-  var value = obj || {};
-  if (!Object.keys(obj)) {
-    return [];
-  }
-  var _iterator = (0, _createForOfIteratorHelper2.default)(path),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var key = _step.value;
-      if (value && value.hasOwnProperty(key)) {
-        value = value[key];
-      } else {
-        return undefined;
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return Object.values(value);
-};
 /** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
-var extractValues = function extractValues(data, pathString) {
-  if (pathString.includes('_')) {
-    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
-    return extractValue(data, namePrefixes);
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = (0, _lodash.isString)(pathString) ? [] : pathString.slice(0, -1);
+  if ((0, _lodash.isString)(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
+    });
+    return result;
   }
-  return pathString.split('-').map(function (item) {
-    return data[item];
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
   });
+  return result;
 };
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
     _value = params.value,
     equalWith = params.equalWith,
     form = params.form,
     name = params.name;
-  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
     return !equalWith(originalValue, value);