@zat-design/sisyphus-react 3.4.13 → 3.5.0-beta.10

package/lib/ProEditTable/utils/index.js

@@ -102,35 +102,7 @@ var getActionColumn = function getActionColumn(config) {
             case 8:
               _context.prev = 8;
               _context.t0 = _context["catch"](3);
-              setTimeout(function () {
-                var errorDom = document.querySelector('.ant-form-item-has-error');
-                if (errorDom) {
-                  var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-                  var tableCell = errorDom.closest('.ant-table-cell');
-                  if (tableBody && tableCell) {
-                    var previousSibling = tableCell.previousElementSibling;
-                    var childOffsetLeft = 0;
-                    var childFixedLeft = 0;
-                    while (previousSibling) {
-                      if (previousSibling.nodeType === 1) {
-                        var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
-                        var _ref2 = previousSibling.getBoundingClientRect() || {},
-                          _ref2$width = _ref2.width,
-                          width = _ref2$width === void 0 ? 0 : _ref2$width;
-                        childOffsetLeft += width;
-                        if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
-                          childFixedLeft += width;
-                        }
-                      }
-                      previousSibling = previousSibling.previousElementSibling;
-                    }
-                    tableBody.scrollTo({
-                      left: childOffsetLeft - childFixedLeft,
-                      behavior: 'smooth'
-                    });
-                  }
-                }
-              }, 0);
+              (0, _tools.handleScrollToError)();
               return _context.abrupt("return", Promise.reject(_context.t0));
             case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
@@ -258,10 +230,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref3 = tooltip || {},
-          tooltipTitle = _ref3.title,
-          icon = _ref3.icon,
-          resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
+        var _ref2 = tooltip || {},
+          tooltipTitle = _ref2.title,
+          icon = _ref2.icon,
+          resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
         item.title = (0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -413,13 +385,13 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
-        var _item, key, value, _ref5, service, option;
+      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
+        var _item, key, value, _ref4, service, option;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = (0, _slicedToArray2.default)(item, 2), key = _item[0], value = _item[1];
-              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
+              _ref4 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref4.service, option = _ref4.option;
               if (!service) {
                 _context2.next = 8;
                 break;
@@ -439,7 +411,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         }, _callee2);
       }));
       return function (_x3) {
-        return _ref4.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }())).then(function (res) {
       res.forEach(function (item) {

package/lib/ProEditTable/utils/tools.d.ts

@@ -26,3 +26,6 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
  * @param rowDisabled 行禁用参数
  */
 export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;
+/** 表格自动滚动到报错位置
+ */
+export declare const handleScrollToError: () => void;

package/lib/ProEditTable/utils/tools.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.splitNames = exports.onDelete = exports.getRandom = exports.getNamePath = exports.getDisabled = exports.difference = exports.customValidate = void 0;
+exports.splitNames = exports.onDelete = exports.handleScrollToError = exports.getRandom = exports.getNamePath = exports.getDisabled = exports.difference = exports.customValidate = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var getRandom = exports.getRandom = function getRandom() {
@@ -158,4 +158,37 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
     return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, (0, _toConsumableArray2.default)(params)));
   }
   return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || convertToBoolean(tabledDisabled);
+};
+/** 表格自动滚动到报错位置
+ */
+var handleScrollToError = exports.handleScrollToError = function handleScrollToError() {
+  setTimeout(function () {
+    var errorDom = document.querySelector('.ant-form-item-has-error');
+    if (errorDom) {
+      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
+      var tableCell = errorDom.closest('.ant-table-cell');
+      if (tableBody && tableCell) {
+        var previousSibling = tableCell.previousElementSibling;
+        var childOffsetLeft = 0;
+        var childFixedLeft = 0;
+        while (previousSibling) {
+          if (previousSibling.nodeType === 1) {
+            var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
+            var _ref3 = previousSibling.getBoundingClientRect() || {},
+              _ref3$width = _ref3.width,
+              width = _ref3$width === void 0 ? 0 : _ref3$width;
+            childOffsetLeft += width;
+            if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
+              childFixedLeft += width;
+            }
+          }
+          previousSibling = previousSibling.previousElementSibling;
+        }
+        tableBody.scrollTo({
+          left: childOffsetLeft - childFixedLeft,
+          behavior: 'smooth'
+        });
+      }
+    }
+  }, 0);
 };

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

@@ -123,7 +123,7 @@ var ActionButton = function ActionButton(props) {
     var _actionProps = (_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.map(function (item) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         // @ts-ignore
-        type: item.actionType
+        type: item.actionType || item.type
       });
     });
     if (!(_actionProps === null || _actionProps === void 0 ? void 0 : _actionProps.find(function (item) {

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

@@ -50,7 +50,7 @@ var ToolbarButton = function ToolbarButton(props) {
     var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(function (item) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         // @ts-ignore
-        type: item.actionType
+        type: item.actionType || item.type
       });
     });
     if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {

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

@@ -652,7 +652,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           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])) {
+      if (!labelInValue && !(0, _lodash.isEqual)(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
         setState({
           _value: value,
           selectedRowKeys: [],

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

@@ -21,6 +21,7 @@ var formatAmount = _utils.tools.formatAmount,
   formatPercent = _utils.tools.formatPercent,
   formatPerMill = _utils.tools.formatPerMill;
 var ProNumberRange = function ProNumberRange(props) {
+  var _valueProps, _valueProps2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -138,8 +139,26 @@ var ProNumberRange = function ProNumberRange(props) {
           }
         };
         break;
+      // 百分比
+      case 'percentage':
+        valueProps = {
+          min: 0,
+          max: 100,
+          step: 1
+        };
+        break;
+      // 千分比
+      case 'permillage':
+        valueProps = {
+          min: 0,
+          max: 1000,
+          step: 1
+        };
+        break;
       default:
-        valueProps = {};
+        valueProps = {
+          max: 999999999999
+        };
     }
   }
   /**
@@ -161,15 +180,16 @@ var ProNumberRange = function ProNumberRange(props) {
       className: "range-left",
       value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
       placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
-      min: min,
-      max: (value === null || value === void 0 ? void 0 : value[1]) || max || range[1],
       precision: precision,
       disabled: getDisabled(disabled, 0),
       onChange: function onChange(e) {
         firstHandleChange(e);
       },
       addonBefore: addonBefore
-    }, valueProps), childProps === null || childProps === void 0 ? void 0 : childProps[0])), (0, _jsxRuntime.jsx)(_antd.Input, {
+    }, valueProps), {}, {
+      min: min || ((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min),
+      max: (value === null || value === void 0 ? void 0 : value[1]) || range[1] || max || ((_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max)
+    }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), (0, _jsxRuntime.jsx)(_antd.Input, {
       className: (0, _classnames.default)({
         'range-split': true,
         'range-split-disabled': !!disabled
@@ -180,15 +200,16 @@ var ProNumberRange = function ProNumberRange(props) {
       className: "range-right",
       value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
       placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
-      min: (value === null || value === void 0 ? void 0 : value[0]) || min || range[0],
-      max: max,
       precision: precision,
       disabled: getDisabled(disabled, 1),
       onChange: function onChange(e) {
         lastHandleChange(e);
       },
       addonAfter: addonAfter
-    }, valueProps), childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
+    }, valueProps), {}, {
+      max: max || ((_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.max),
+      min: (value === null || value === void 0 ? void 0 : value[0]) || range[0] || min || ((_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.min)
+    }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
   });
 };
 var _default = exports.default = ProNumberRange;

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
-export type ValueTypeEnum = 'percentage' | 'permillage' | 'thousandth';
 export interface ProNumberRangeProps {
     /**
      * @description       组件的值,[最小值，最大值]
@@ -46,7 +45,7 @@ export interface ProNumberRangeProps {
      * @description       值类型，回显时区分金额与百分比
      * @default           '-'
      */
-    valueType?: ValueTypeEnum;
+    valueType?: 'percentage' | 'permillage' | 'thousandth';
     /**
      * @description       空值查看时默认展示内容
      * @default           '-'

package/lib/ProForm/index.js

@@ -164,7 +164,7 @@ var ProForm = function ProForm(props, ref) {
     // 暂时通过'-'区分组合组件字段和普通字段
     var keys = Object.keys(changedValue);
     if (!keys.length) {
-      onValuesChange(changedValue, form.getFieldsValue());
+      onValuesChange((0, _index.filterInternalFields)(changedValue), form.getFieldsValue());
     } else {
       var values = keys.map(function (key) {
         if (key.includes('-')) {
@@ -176,7 +176,7 @@ var ProForm = function ProForm(props, ref) {
         }
         return {};
       });
-      onValuesChange(_lodash.merge.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values))), form.getFieldsValue());
+      onValuesChange((0, _index.filterInternalFields)(_lodash.merge.apply(void 0, [changedValue].concat((0, _toConsumableArray2.default)(values)))), form.getFieldsValue());
     }
   };
   // 包装一层兼容 names 改变

package/lib/ProForm/style/index.less

@@ -215,6 +215,7 @@
   .@{ant-prefix}-form-item-label {
     > label {
       white-space: pre-wrap;
+      word-break: break-all;
     }
   }
 

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

@@ -1,2 +1,6 @@
 import { FormInstance } from 'antd';
-export declare const useForm: <T>(originForm: FormInstance<T>) => [FormInstance<T>];
+type ModifiedFormInstance<T> = FormInstance<T> & {
+    isModified?: boolean;
+};
+export declare const useForm: <T>(originForm: ModifiedFormInstance<T>) => [ModifiedFormInstance<T>];
+export {};

package/lib/ProForm/utils/useForm.js

@@ -10,13 +10,16 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
 var _index = require("./index");
+var _tools = require("../../ProEditTable/utils/tools");
 var useForm = exports.useForm = function useForm(originForm) {
   var _Form$useForm = _antd.Form.useForm(originForm),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
-    setFieldsValue = form.setFieldsValue;
+    setFieldsValue = form.setFieldsValue,
+    isModified = form.isModified;
+  if (isModified) return [form];
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
     // 全部查询
@@ -44,7 +47,6 @@ var useForm = exports.useForm = function useForm(originForm) {
         _form$getInternalHook,
         getFields,
         fieldsList,
-        _error$errorFields,
         _error$errorFields$,
         _args = arguments;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -58,7 +60,7 @@ var useForm = exports.useForm = function useForm(originForm) {
             isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
             validateNames = []; // 前缀校验模式
             if (!isRecursive) {
-              _context.next = 10;
+              _context.next = 12;
               break;
             }
             // @ts-ignore
@@ -72,28 +74,35 @@ var useForm = exports.useForm = function useForm(originForm) {
             });
             // @ts-ignore
             delete rest[0].recursive;
-            return _context.abrupt("return", validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
+            _context.next = 11;
+            return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return (0, _index.filterInternalFields)(values);
-            }));
-          case 10:
-            return _context.abrupt("return", validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
+            });
+          case 11:
+            return _context.abrupt("return", _context.sent);
+          case 12:
+            _context.next = 14;
+            return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
               return nameList ? values : _getFieldsValue();
-            }));
-          case 13:
-            _context.prev = 13;
+            });
+          case 14:
+            return _context.abrupt("return", _context.sent);
+          case 17:
+            _context.prev = 17;
             _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, {
+            if (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields) {
+              form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
+            (0, _tools.handleScrollToError)();
             throw _context.t0;
-          case 17:
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 13]]);
+      }, _callee, null, [[0, 17]]);
     }));
     return function _validateFields(_x) {
       return _ref.apply(this, arguments);
@@ -101,6 +110,7 @@ var useForm = exports.useForm = function useForm(originForm) {
   }();
   form.getFieldsValue = _getFieldsValue;
   form.validateFields = _validateFields;
+  form.isModified = true;
   // form.setFieldsValue = _setFieldsValue;
   return [form];
 };

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

@@ -34,9 +34,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;
@@ -47,9 +44,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;

package/lib/ProForm/utils/valueType.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _big = _interopRequireDefault(require("big.js"));
+var _lodash = require("lodash");
 var _utils = require("@zat-design/utils");
 var transformDate = _utils.transforms.transformDate,
   transformSwitch = _utils.transforms.transformSwitch;
@@ -20,8 +21,35 @@ var transformRatio = function transformRatio(_ref) {
     precision = _ref$precision === void 0 ? 2 : _ref$precision,
     valueType = _ref.valueType;
   if (type === 'ProNumberRange' && ['permillage', 'percentage'].includes(valueType)) {
-    console.error('Warning: ProNumberRange valueType can only be set to [thousandth]');
-    return {};
+    var ref = null;
+    return {
+      normalize: function normalize(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {};
+        }
+        return [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? (0, _big.default)(value[0] - 0).div(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? (0, _big.default)(value[1] - 0).div(Math.pow(10, precision)).toNumber() : null];
+      },
+      getValueProps: function getValueProps(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {
+            value: []
+          };
+        }
+        if ((0, _lodash.isEqual)(ref, value)) {
+          return {
+            value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? (0, _big.default)(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? (0, _big.default)(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+          };
+        }
+        ref = value;
+        return {
+          value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? (0, _big.default)(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? (0, _big.default)(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+        };
+      }
+    };
   }
   return {
     normalize: function normalize(value) {

package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -24,8 +24,7 @@ var OpenMenu = function OpenMenu(props) {
     dataSource = props.dataSource,
     style = props.style,
     _props$theme = props.theme,
-    theme = _props$theme === void 0 ? 'dark' : _props$theme,
-    otherProps = props.otherProps;
+    theme = _props$theme === void 0 ? 'dark' : _props$theme;
   var _ref = dataSource || {},
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;

package/lib/ProLayout/index.js

@@ -31,7 +31,8 @@ var ProLayout = function ProLayout(props) {
     headerNotice = props.headerNotice,
     noticeIn = props.notice,
     dataSource = props.dataSource,
-    theme = props.theme;
+    theme = props.theme,
+    onCollapsedChange = props.onCollapsedChange;
   var _useSetState = (0, _ahooks.useSetState)({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -92,7 +93,10 @@ var ProLayout = function ProLayout(props) {
         dataSource: menus,
         notice: notice,
         collapsed: collapsed,
-        onToggle: toggle
+        onToggle: function onToggle() {
+          toggle();
+          onCollapsedChange && onCollapsedChange(!collapsed);
+        }
       })), (0, _jsxRuntime.jsx)("div", {
         className: "pro-layout-content",
         style: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, contentStyle), {}, {

package/lib/ProLayout/propTypes.d.ts

@@ -51,6 +51,10 @@ export interface ProLayoutProps {
     contentStyle?: CSSProperties;
     waterMarkProps?: ProWaterMarkProps;
     theme?: themeEnum;
+    /**
+  *  折叠回调事件
+  */
+    onCollapsedChange?: (collapsed: any) => void;
     [key: string]: any;
 }
 export interface ProLayoutStates {

package/lib/ProSelect/index.js

@@ -28,7 +28,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
-    showCodeName = _ref.showCodeName;
+    showCodeName = _ref.showCodeName,
+    gViewportReady = _ref.viewportReady;
   var label = 'label';
   var code = 'value';
   if (proSelectFieldNames && Object.keys(proSelectFieldNames).length) {
@@ -55,16 +56,16 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     isViewPro = props.isView,
-    _props$viewportReady = props.viewportReady,
-    viewportReady = _props$viewportReady === void 0 ? false : _props$viewportReady,
+    __viewportReady = props.viewportReady,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var viewportReady = __viewportReady || gViewportReady;
   /** 是否在可视区域出现过 */
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     viewFlag = _useState2[0],
     setViewFlag = _useState2[1];
-  var refSelect = (0, _react.useRef)();
-  var _useInViewport = (0, _ahooks.useInViewport)(refSelect),
+  var refSelect1 = (0, _react.useRef)();
+  var _useInViewport = (0, _ahooks.useInViewport)(refSelect1),
     _useInViewport2 = (0, _slicedToArray2.default)(_useInViewport, 1),
     inViewport = _useInViewport2[0];
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
@@ -300,45 +301,53 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       fieldNames: fieldNames
     });
   }
-  return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
-    allowClear: true,
-    showArrow: true,
-    loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
-    onChange: handleChange,
-    optionLabelProp: "children" // 解决warning报错，添加默认值
-    ,
-    showSearch: true,
-    filterOption: (0, _lodash.isFunction)(_onSearch) ? false : function (input, option) {
-      var _option$children, _option$children$prop;
-      var value = (0, _lodash.isString)(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 ? void 0 : (_option$children = option.children) === null || _option$children === void 0 ? void 0 : (_option$children$prop = _option$children.props) === null || _option$children$prop === void 0 ? void 0 : _option$children$prop.title;
-      return value.toLowerCase().includes(input.toLowerCase());
-    },
-    onSearch: function onSearch(value) {
-      _onSearch && _onSearch(value, (0, _objectSpread2.default)({}, fetchFunction));
-    },
-    getPopupContainer: function getPopupContainer(trigger) {
-      return scrollFollowParent ? trigger.parentElement : document.body;
-    }
-  }, (0, _lodash.omit)((0, _lodash.cloneDeep)(selectProps), ['isView', 'showCodeName', 'form', 'name'])), {}, {
-    value: transformValue(),
-    children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
-      return (0, _jsxRuntime.jsx)(Option, {
-        value: item[code],
-        record: item,
-        disabled: !!item.disabled,
-        children: (0, _jsxRuntime.jsx)(TooltipOption, {
-          title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
-          children: OptionRender ? (0, _jsxRuntime.jsx)("span", {
-            title: OptionRender(item),
-            children: OptionRender(item)
-          }) : (0, _jsxRuntime.jsx)("span", {
-            title: "".concat(item[code], "-").concat(item[label]),
-            children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
-          })
-        }, item[code])
-      }, item[code]);
-    })
-  }));
+  return (0, _jsxRuntime.jsx)("div", {
+    ref: refSelect1,
+    style: props.style,
+    className: "ant-select-compact-item-div",
+    children: (0, _jsxRuntime.jsx)(_antd.Select
+    // id={refSelect1.current}
+    , (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      // id={refSelect1.current}
+      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
+      allowClear: true,
+      showArrow: true,
+      loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
+      onChange: handleChange,
+      optionLabelProp: "children" // 解决warning报错，添加默认值
+      ,
+      showSearch: true,
+      filterOption: (0, _lodash.isFunction)(_onSearch) ? false : function (input, option) {
+        var _option$children, _option$children$prop;
+        var value = (0, _lodash.isString)(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 ? void 0 : (_option$children = option.children) === null || _option$children === void 0 ? void 0 : (_option$children$prop = _option$children.props) === null || _option$children$prop === void 0 ? void 0 : _option$children$prop.title;
+        return value.toLowerCase().includes(input.toLowerCase());
+      },
+      onSearch: function onSearch(value) {
+        _onSearch && _onSearch(value, (0, _objectSpread2.default)({}, fetchFunction));
+      },
+      getPopupContainer: function getPopupContainer(trigger) {
+        return scrollFollowParent ? trigger.parentElement : document.body;
+      }
+    }, (0, _lodash.omit)((0, _lodash.cloneDeep)(selectProps), ['isView', 'showCodeName', 'form', 'name', 'style'])), {}, {
+      value: transformValue(),
+      children: Array.isArray(newSelectList) && newSelectList.map(function (item) {
+        return (0, _jsxRuntime.jsx)(Option, {
+          value: item[code],
+          record: item,
+          disabled: !!item.disabled,
+          children: (0, _jsxRuntime.jsx)(TooltipOption, {
+            title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label],
+            children: OptionRender ? (0, _jsxRuntime.jsx)("span", {
+              title: OptionRender(item),
+              children: OptionRender(item)
+            }) : (0, _jsxRuntime.jsx)("span", {
+              title: "".concat(item[code], "-").concat(item[label]),
+              children: selectProps.showCodeName ? "".concat(item[code], "-").concat(item[label]) : item[label]
+            })
+          }, item[code])
+        }, item[code]);
+      })
+    }))
+  });
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(ProSelect);

package/lib/ProSelect/index.less

@@ -9,3 +9,9 @@
   text-overflow: ellipsis;
   word-break: keep-all;
 }
+.ant-select-compact-item-div {
+  width: 100%;
+  >.ant-select {
+    width: 100%;
+  }
+}