@zat-design/sisyphus-react 3.0.16-beta.2 → 3.1.4

package/lib/ProForm/components/base/InputNumber/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -10,18 +9,33 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _react = _interopRequireWildcard(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = require("react");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _big = _interopRequireDefault(require("big.js"));
-var _zatDesignProComponent = require("zat-design-pro-component");
-var _utils = require("@zat-design-pro-component/utils");
+var _utils = require("@zat-design/utils");
 var _lodash = require("lodash");
+var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _index = require("../../../utils/index");
 var _excluded = ["placeholder", "className", "otherProps", "range", "min", "max", "onBlur"];
 var calc = _utils.tools.calc;
 var rangeReg = /^[([](-?\d+(\.\d+)?)?,\s*(-?\d+(\.\d+)?)?[)\]]$/;
+/**
+ * 限制数字范围
+ */
+var limitNumber = function limitNumber(num, _ref) {
+  var min = _ref.min,
+    max = _ref.max;
+  if (num >= max) {
+    return max;
+  }
+  if (num <= min) {
+    return min;
+  }
+  return num;
+};
 var InputNumber = function InputNumber(props) {
   var placeholder = props.placeholder,
     className = props.className,
@@ -31,12 +45,12 @@ var InputNumber = function InputNumber(props) {
     max = props.max,
     onBlur = props.onBlur,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    viewType = _ref.viewType,
-    valueType = _ref.valueType,
-    label = _ref.label;
+  var _ref2 = otherProps || {},
+    isView = _ref2.isView,
+    viewEmpty = _ref2.viewEmpty,
+    viewType = _ref2.viewType,
+    valueType = _ref2.valueType,
+    label = _ref2.label;
   var valueProps = {};
   if (valueType) {
     switch (valueType) {
@@ -47,10 +61,20 @@ var InputNumber = function InputNumber(props) {
       case 'amount':
         valueProps = {
           formatter: function formatter(value) {
-            return "".concat(value).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+            if (value === '') {
+              return '';
+            }
+            var num = Number(value);
+            if (Number.isNaN(num)) {
+              return value;
+            }
+            return num.toLocaleString('en-US', {
+              maximumFractionDigits: (props === null || props === void 0 ? void 0 : props.precision) || 0
+            });
           },
           parser: function parser(value) {
-            return value.replace(/\$\s?|(,*)/g, '');
+            var num = Number(value.replace(/[\s,]+/g, ''));
+            return Number.isNaN(num) ? value : num.toFixed((props === null || props === void 0 ? void 0 : props.precision) || 0);
           }
         };
         break;
@@ -77,7 +101,7 @@ var InputNumber = function InputNumber(props) {
     }
   }
   var _useMemo = (0, _react.useMemo)(function () {
-      var _ref2, _min2, _valueProps, _ref3, _max2, _valueProps2;
+      var _ref3, _min2, _valueProps, _ref4, _max2, _valueProps2;
       var _min;
       var _max;
       if (range) {
@@ -113,12 +137,12 @@ var InputNumber = function InputNumber(props) {
           }
         }
       }
-      return [(_ref2 = (_min2 = _min) !== null && _min2 !== void 0 ? _min2 : min) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min, (_ref3 = (_max2 = _max) !== null && _max2 !== void 0 ? _max2 : max) !== null && _ref3 !== void 0 ? _ref3 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max];
+      return [(_ref3 = (_min2 = _min) !== null && _min2 !== void 0 ? _min2 : min) !== null && _ref3 !== void 0 ? _ref3 : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min, (_ref4 = (_max2 = _max) !== null && _max2 !== void 0 ? _max2 : max) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max];
     }, [range, min, max, rest.precision]),
     _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
     _min = _useMemo2[0],
     _max = _useMemo2[1];
-  var initialConfig = (0, _zatDesignProComponent.useProConfig)('InputNumber');
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('InputNumber');
   var _className = (0, _classnames.default)((0, _defineProperty2.default)({
     'full-form-item': true
   }, className, !!className));
@@ -127,7 +151,9 @@ var InputNumber = function InputNumber(props) {
       precision = rest.precision;
     // 值为空时返回viewEmpty
     if ((0, _lodash.isNull)(value) || (0, _lodash.isUndefined)(value)) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, viewEmpty);
+      return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: viewEmpty
+      });
     }
     switch (valueType || viewType) {
       // 百分比
@@ -139,14 +165,16 @@ var InputNumber = function InputNumber(props) {
           // 获取真实数据的小数位数
           var decimalDigits = (0, _index.getDecimalDigits)(originValue);
           if (decimalDigits > (precision || 4)) {
-            return /*#__PURE__*/_react.default.createElement(_Container.default, {
-              viewEmpty: viewEmpty
-            }, value);
+            return (0, _jsxRuntime.jsx)(_Container.default, {
+              viewEmpty: viewEmpty,
+              children: value
+            });
           }
         }
-        return /*#__PURE__*/_react.default.createElement(_Container.default, {
-          viewEmpty: viewEmpty
-        }, (0, _big.default)(value).toNumber().toFixed((0, _lodash.isNumber)(precision) ? precision : 2));
+        return (0, _jsxRuntime.jsx)(_Container.default, {
+          viewEmpty: viewEmpty,
+          children: (0, _big.default)(value).toNumber().toFixed((0, _lodash.isNumber)(precision) ? precision : 2)
+        });
       // 千分比
       case 'permillage':
         if (value) {
@@ -155,45 +183,66 @@ var InputNumber = function InputNumber(props) {
           // 获取真实数据的小数位数
           var _decimalDigits = (0, _index.getDecimalDigits)(_originValue);
           if (_decimalDigits > (precision || 5)) {
-            return /*#__PURE__*/_react.default.createElement(_Container.default, {
-              viewEmpty: viewEmpty
-            }, value);
+            return (0, _jsxRuntime.jsx)(_Container.default, {
+              viewEmpty: viewEmpty,
+              children: value
+            });
           }
         }
-        return /*#__PURE__*/_react.default.createElement(_Container.default, {
-          viewEmpty: viewEmpty
-        }, (0, _big.default)(value).toNumber().toFixed((0, _lodash.isNumber)(precision) ? precision : 2));
+        return (0, _jsxRuntime.jsx)(_Container.default, {
+          viewEmpty: viewEmpty,
+          children: (0, _big.default)(value).toNumber().toFixed((0, _lodash.isNumber)(precision) ? precision : 2)
+        });
       // 千分位
       case 'amount':
       case 'money':
       case 'thousandth':
-        return /*#__PURE__*/_react.default.createElement(_Container.default, {
-          viewEmpty: viewEmpty
-        }, _utils.tools.formatAmount(value, precision));
+        return (0, _jsxRuntime.jsx)(_Container.default, {
+          viewEmpty: viewEmpty,
+          children: _utils.tools.formatAmount(value, precision || 2)
+        });
       // CNY千分位
       case 'thousandthCNY':
-        return /*#__PURE__*/_react.default.createElement(_Container.default, {
-          viewEmpty: viewEmpty
-        }, /*#__PURE__*/_react.default.createElement(_antd.Space, {
-          size: 4
-        }, value || value === 0 ? 'CNY' : '', _utils.tools.formatAmount(value, precision)));
+        return (0, _jsxRuntime.jsx)(_Container.default, {
+          viewEmpty: viewEmpty,
+          children: (0, _jsxRuntime.jsxs)(_antd.Space, {
+            size: 4,
+            children: [value || value === 0 ? 'CNY' : '', _utils.tools.formatAmount(value, precision)]
+          })
+        });
       default:
-        return /*#__PURE__*/_react.default.createElement(_Container.default, {
-          viewEmpty: viewEmpty
-        }, value);
+        return (0, _jsxRuntime.jsx)(_Container.default, {
+          viewEmpty: viewEmpty,
+          children: value
+        });
     }
   }
-  var handleBlur = function handleBlur() {
-    var _value = rest.value;
-    if (rest.value > _max) {
-      _value = _max;
-    }
-    if (rest.value < _min) {
-      _value = _min;
+  // 失去焦点时处理数字，
+  var handleBlur = function handleBlur(e) {
+    var _e$target, _e$target2;
+    var value = Number(e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value);
+    var limit = {
+      min: Number(_min),
+      max: Number(_max)
+    };
+    switch (valueType || viewType) {
+      // 百分比
+      case 'percent':
+      case 'percentage':
+        value = calc(limitNumber(value, limit), '/', 100);
+        break;
+      // 千分比
+      case 'permillage':
+        value = calc(limitNumber(value, limit), '/', 1000);
+        break;
+      default:
+        value = limitNumber(value, limit);
+        break;
     }
-    onBlur(_value);
+    // 第一个类型转换值，第二个原始值
+    onBlur(value, Number(e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.value));
   };
-  return /*#__PURE__*/_react.default.createElement(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     autoComplete: "off",
     placeholder: placeholder || "\u8BF7\u8F93\u5165".concat(label !== null && label !== void 0 ? label : ''),
     className: _className
@@ -203,5 +252,4 @@ var InputNumber = function InputNumber(props) {
     max: _max
   }));
 };
-var _default = InputNumber;
-exports.default = _default;
+var _default = exports.default = InputNumber;

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

@@ -0,0 +1,14 @@
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
+import { CascaderProps } from 'antd';
+interface RequestProps<T, P extends any[]> {
+    service: Service<T, P>;
+    options?: Options<T, P>;
+}
+export type Props<T, RT extends T[], RP> = CascaderProps<T> & {
+    useRequest?: RequestProps<RT, [RP]>;
+    otherProps?: any;
+    isView?: boolean;
+    dataSource?: T[];
+};
+declare const ProCascader: <T, RT extends T[], RP>(props: Props<T, RT, RP>) => JSX.Element;
+export default ProCascader;

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

@@ -0,0 +1,78 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _ahooks = require("ahooks");
+var _antd = require("antd");
+var _Container = _interopRequireDefault(require("../../Container"));
+var _excluded = ["useRequest", "isView", "otherProps", "dataSource", "options"];
+var defaultFieldNames = {
+  value: 'value',
+  label: 'label',
+  children: 'children'
+};
+/**
+ * 获取值对应的选项对象
+ */
+var findTreeTarget = function findTreeTarget(dataSource, value, fieldNames) {
+  var level = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+  var stack = (0, _toConsumableArray2.default)(dataSource);
+  if ((dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) && (value === null || value === void 0 ? void 0 : value.length)) {
+    var valueName = fieldNames.value,
+      label = fieldNames.label,
+      children = fieldNames.children;
+    return value === null || value === void 0 ? void 0 : value.map(function (valueItem) {
+      var index = 0;
+      while (stack.length) {
+        var target = stack.shift();
+        if (target[valueName] === valueItem) {
+          stack = target[children] ? (0, _toConsumableArray2.default)(target[children]) : [];
+          return target;
+        }
+        index += 1;
+      }
+      return (0, _defineProperty2.default)({}, valueName, valueItem);
+    });
+  }
+  return [];
+};
+var ProCascader = function ProCascader(props) {
+  var _restProps$fieldNames;
+  var requestProps = props.useRequest,
+    isView = props.isView,
+    otherProps = props.otherProps,
+    dataSource = props.dataSource,
+    options = props.options,
+    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref2 = otherProps || {},
+    formIsView = _ref2.isView;
+  var _useRequest = (0, _ahooks.useRequest)(requestProps === null || requestProps === void 0 ? void 0 : requestProps.service, requestProps === null || requestProps === void 0 ? void 0 : requestProps.options),
+    data = _useRequest.data;
+  var _isView = isView || formIsView;
+  var _dataSource = data || dataSource || options;
+  var _fieldNames = (_restProps$fieldNames = restProps.fieldNames) !== null && _restProps$fieldNames !== void 0 ? _restProps$fieldNames : defaultFieldNames;
+  if (_isView) {
+    var valueTarget = findTreeTarget(_dataSource, restProps.value, _fieldNames);
+    var valueName = _fieldNames.value,
+      label = _fieldNames.label;
+    var nameList = valueTarget.map(function (item) {
+      var _item$label;
+      return (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : item[valueName];
+    });
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      children: nameList.join('/')
+    });
+  }
+  return (0, _jsxRuntime.jsx)(_antd.Cascader, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+    options: _dataSource
+  }));
+};
+var _default = exports.default = ProCascader;

package/lib/ProForm/components/base/Radio/index.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _react = _interopRequireDefault(require("react"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _excluded = ["dataSource", "fieldNames", "onChange", "value", "otherProps"];
@@ -37,9 +37,10 @@ var Radio = function Radio(props) {
       });
       return labelList.join('，');
     };
-    return /*#__PURE__*/_react.default.createElement(_Container.default, {
-      viewEmpty: viewEmpty
-    }, value ? transToLabel([value]) : '');
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty,
+      children: value ? transToLabel([value]) : ''
+    });
   }
   // 假如dataSource包含code,name, fieldNames没有配置，_fieldNames默认为code, name
   if (Array.isArray(dataSource) && !fieldNames) {
@@ -54,17 +55,17 @@ var Radio = function Radio(props) {
       };
     }
   }
-  return /*#__PURE__*/_react.default.createElement(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+  return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     value: value,
     onChange: function onChange(e) {
       _onChange(e, e.target.value);
-    }
-  }), !!dataSource.length && dataSource.map(function (radioItem) {
-    return /*#__PURE__*/_react.default.createElement(_antd.Radio, {
-      key: radioItem[_fieldNames.value],
-      value: radioItem[_fieldNames.value]
-    }, radioItem[_fieldNames.label]);
+    },
+    children: !!dataSource.length && dataSource.map(function (radioItem) {
+      return (0, _jsxRuntime.jsx)(_antd.Radio, {
+        value: radioItem[_fieldNames.value],
+        children: radioItem[_fieldNames.label]
+      }, radioItem[_fieldNames.value]);
+    })
   }));
 };
-var _default = Radio;
-exports.default = _default;
+var _default = exports.default = Radio;

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

@@ -1,9 +1,10 @@
-import { RangePickerProps } from 'antd/lib/date-picker';
+import type { RangePickerProps } from 'antd/es/date-picker';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
 export type Props = {
     otherProps?: ProFormOtherProps;
-    showTime?: string;
-} & RangePickerProps;
+    separator?: any;
+    showTime?: any;
+} & Omit<RangePickerProps, 'separator'>;
 declare const RangePicker: React.FC<Props>;
 export default RangePicker;

package/lib/ProForm/components/base/RangePicker/index.js

@@ -7,18 +7,20 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _moment = _interopRequireDefault(require("moment"));
-var _react = _interopRequireDefault(require("react"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["format", "otherProps"]; // @ts-check
+var _excluded = ["format", "otherProps", "separator"]; // @ts-check
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     otherProps = props.otherProps,
+    _props$separator = props.separator,
+    separator = _props$separator === void 0 ? '~' : _props$separator,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
@@ -38,15 +40,16 @@ var RangePicker = function RangePicker(props) {
         }
         return value[index].format(formatItem);
       });
-      viewChildren = formattedList.join('~');
+      viewChildren = formattedList.join(separator);
     } else if ((0, _lodash.isFunction)(format)) {
-      viewChildren = "".concat(format(value[0]), " ~ ").concat(format(value[1]));
+      viewChildren = "".concat(format(value[0]), " ").concat(separator, " ").concat(format(value[1]));
     } else {
-      viewChildren = "".concat(value[0].format(format), " ~ ").concat(value[1].format(format));
+      viewChildren = "".concat(value[0].format(format), " ").concat(separator, " ").concat(value[1].format(format));
     }
-    return /*#__PURE__*/_react.default.createElement(_Container.default, {
-      viewEmpty: viewEmpty
-    }, viewChildren);
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty,
+      children: viewChildren
+    });
   }
   var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
     showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
@@ -58,7 +61,6 @@ var RangePicker = function RangePicker(props) {
   if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
     _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
   }
-  return /*#__PURE__*/_react.default.createElement(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), _res));
+  return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_res, ['separator'])));
 };
-var _default = RangePicker;
-exports.default = _default;
+var _default = exports.default = RangePicker;

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

@@ -3,6 +3,7 @@ import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
 export interface Props extends SelectProps {
     dataSource?: any[];
+    scrollFollowParent?: boolean;
     otherProps?: ProFormOtherProps;
 }
 declare const Select: React.FC<Props>;

package/lib/ProForm/components/base/Select/index.js

@@ -7,21 +7,23 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _zatDesignProComponent = require("zat-design-pro-component");
-var _react = _interopRequireDefault(require("react"));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["dataSource", "fieldNames", "otherProps"];
+var _ProConfigProvider = require("../../../../ProConfigProvider");
+var _excluded = ["dataSource", "fieldNames", "otherProps", "scrollFollowParent"];
 var Select = function Select(props) {
   var _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
     fieldNames = props.fieldNames,
     otherProps = props.otherProps,
+    _props$scrollFollowPa = props.scrollFollowParent,
+    scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
     viewEmpty = _ref.viewEmpty;
-  var initialConfig = (0, _zatDesignProComponent.useProConfig)('Select') || {};
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('Select') || {};
   var _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',
     value: 'value'
@@ -38,14 +40,16 @@ var Select = function Select(props) {
       return labelList.join('，');
     };
     if (Array.isArray(value)) {
-      return /*#__PURE__*/_react.default.createElement(_Container.default, {
+      return (0, _jsxRuntime.jsx)(_Container.default, {
         tooltip: true,
-        viewEmpty: viewEmpty
-      }, transToLabel(value));
+        viewEmpty: viewEmpty,
+        children: transToLabel(value)
+      });
     }
-    return /*#__PURE__*/_react.default.createElement(_Container.default, {
-      viewEmpty: viewEmpty
-    }, value ? transToLabel([value]) : null);
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty,
+      children: value ? transToLabel([value]) : null
+    });
   }
   // 假如dataSource包含code,name, fieldNames没有配置，_fieldNames默认为code, name
   if (Array.isArray(dataSource) && !fieldNames) {
@@ -60,14 +64,16 @@ var Select = function Select(props) {
       };
     }
   }
-  return /*#__PURE__*/_react.default.createElement(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     placeholder: "\u8BF7\u9009\u62E9",
-    allowClear: true
+    allowClear: true,
+    getPopupContainer: function getPopupContainer(trigger) {
+      return scrollFollowParent ? trigger.parentElement : document.body;
+    }
   }, initialConfig), {}, {
     options: dataSource
   }, rest), {}, {
     fieldNames: _fieldNames
   }));
 };
-var _default = Select;
-exports.default = _default;
+var _default = exports.default = Select;

package/lib/ProForm/components/base/Switch/index.js

@@ -7,10 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
-var _react = _interopRequireDefault(require("react"));
-var _zatDesignProComponent = require("zat-design-pro-component");
 var _lodash = require("lodash");
+var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _excluded = ["disabled", "otherProps"];
 var Switch = function Switch(props) {
@@ -21,20 +21,22 @@ var Switch = function Switch(props) {
     isView = _ref.isView,
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
-  var config = (0, _zatDesignProComponent.useProConfig)('Switch');
+  var config = (0, _ProConfigProvider.useProConfig)('Switch');
   if (isView) {
     if ((0, _lodash.isUndefined)(res === null || res === void 0 ? void 0 : res.checked) || (0, _lodash.isNull)(res === null || res === void 0 ? void 0 : res.checked) || valueType === 'switch' && (0, _lodash.isUndefined)(res.value)) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, viewEmpty);
+      return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: viewEmpty
+      });
     }
-    return /*#__PURE__*/_react.default.createElement(_Container.default, {
-      viewEmpty: viewEmpty
-    }, res.checked === true ? '是' : '否');
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      viewEmpty: viewEmpty,
+      children: res.checked === true ? '是' : '否'
+    });
   }
-  return /*#__PURE__*/_react.default.createElement(_antd.Switch, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Switch, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
     checkedChildren: "\u662F",
     unCheckedChildren: "\u5426"
   }, config), res));
 };
-var _default = Switch;
-exports.default = _default;
+var _default = exports.default = Switch;

package/lib/ProForm/components/base/SwitchCheckbox/index.js

@@ -1,14 +1,13 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var React = _interopRequireWildcard(require("react"));
+var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
@@ -29,26 +28,33 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
   };
   if (isView) {
     if ((0, _lodash.isUndefined)(restProps.checked) || (0, _lodash.isNull)(restProps.checked) || valueType === 'switch' && (0, _lodash.isUndefined)(value)) {
-      return /*#__PURE__*/React.createElement("span", {
-        className: "switch-checkbox-view"
-      }, /*#__PURE__*/React.createElement("span", {
-        className: "switch-checkbox-view-label"
-      }, restProps.label), /*#__PURE__*/React.createElement("span", {
-        className: "switch-checkbox-view-value"
-      }, viewEmpty));
+      return (0, _jsxRuntime.jsxs)("span", {
+        className: "switch-checkbox-view",
+        children: [(0, _jsxRuntime.jsx)("span", {
+          className: "switch-checkbox-view-label",
+          children: restProps.label
+        }), (0, _jsxRuntime.jsx)("span", {
+          className: "switch-checkbox-view-value",
+          children: viewEmpty
+        })]
+      });
     }
-    return /*#__PURE__*/React.createElement("span", {
-      className: "switch-checkbox-view"
-    }, /*#__PURE__*/React.createElement("span", {
-      className: "switch-checkbox-view-label"
-    }, restProps.label), /*#__PURE__*/React.createElement("span", {
-      className: "switch-checkbox-view-value"
-    }, restProps.checked === true ? '是' : '否'));
+    return (0, _jsxRuntime.jsxs)("span", {
+      className: "switch-checkbox-view",
+      children: [(0, _jsxRuntime.jsx)("span", {
+        className: "switch-checkbox-view-label",
+        children: restProps.label
+      }), (0, _jsxRuntime.jsx)("span", {
+        className: "switch-checkbox-view-value",
+        children: restProps.checked === true ? '是' : '否'
+      })]
+    });
   }
-  return /*#__PURE__*/React.createElement(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return (0, _jsxRuntime.jsx)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
     onChange: changeVal
-  }, initialConfig), restProps), restProps.label);
+  }, initialConfig), restProps), {}, {
+    children: restProps.label
+  }));
 };
-var _default = SwitchCheckbox;
-exports.default = _default;
+var _default = exports.default = SwitchCheckbox;