@zat-design/sisyphus-react 4.2.0-beta.2 → 4.2.0-beta.4

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

@@ -1,14 +1,10 @@
-var _excluded = ["format", "otherProps", "separator", "range", "presets"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import _uniq from "lodash/uniq";
+import _omit from "lodash/omit";
+import _isString from "lodash/isString";
+import _isObject from "lodash/isObject";
+import _isFunction from "lodash/isFunction";
 // @ts-check
 import { DatePicker } from 'antd';
-import { isFunction, isObject, isString, omit, uniq } from 'lodash';
 import dayjs from 'dayjs';
 import React from 'react';
 import { useProConfig } from "../../../../ProConfigProvider";
@@ -17,10 +13,12 @@ import ProForm from "../../../../ProForm";
 import Container from "../../Container";
 import { useDateRange } from "./useDateRange";
 import { jsx as _jsx } from "react/jsx-runtime";
-var AntRangePicker = DatePicker.RangePicker;
+const {
+  RangePicker: AntRangePicker
+} = DatePicker;
 
 /** 与 DatePicker 一致：无 valueType 时按 picker 决定默认展示格式 */
-var getDefaultFormat = picker => {
+const getDefaultFormat = picker => {
   switch (picker) {
     case 'week':
       return 'YYYY-ww';
@@ -36,9 +34,8 @@ var getDefaultFormat = picker => {
 };
 
 // 获取默认快捷选项（presets 格式）
-var getDefaultPresets = () => {
-  var _locale$RangePicker;
-  var rangeLabels = (locale === null || locale === void 0 || (_locale$RangePicker = locale.RangePicker) === null || _locale$RangePicker === void 0 ? void 0 : _locale$RangePicker.ranges) || {
+const getDefaultPresets = () => {
+  const rangeLabels = locale?.RangePicker?.ranges || {
     today: '今天',
     lastWeek: '近1周',
     lastMonth: '近1月',
@@ -62,29 +59,31 @@ var getDefaultPresets = () => {
     value: [dayjs().subtract(1, 'year').startOf('day'), dayjs().endOf('day')]
   }];
 };
-var RangePicker = props => {
-  var format = props.format,
-    otherProps = props.otherProps,
-    _props$separator = props.separator,
-    separator = _props$separator === void 0 ? '~' : _props$separator,
-    range = props.range,
-    presets = props.presets,
-    rest = _objectWithoutProperties(props, _excluded);
-  var initialConfig = useProConfig('AntRangePicker');
-  var _ref = ProForm.useFieldProps() || {},
-    isViewCon = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    valueType = _ref.valueType;
+const RangePicker = props => {
+  const {
+    format,
+    otherProps,
+    separator = '~',
+    range,
+    presets,
+    ...rest
+  } = props;
+  const initialConfig = useProConfig('AntRangePicker');
+  const {
+    isView: isViewCon,
+    viewEmpty,
+    valueType
+  } = ProForm.useFieldProps() || {};
 
   // 优先级：valueType > format > picker 默认（与 DatePicker 一致）
-  var nextFormat;
+  let nextFormat;
   if (valueType === 'dateTime') {
     nextFormat = 'YYYY-MM-DD HH:mm:ss';
   } else if (valueType === 'date' || valueType === 'dateStartEndTime') {
     nextFormat = 'YYYY-MM-DD';
-  } else if (isFunction(format)) {
+  } else if (_isFunction(format)) {
     nextFormat = undefined;
-  } else if (Array.isArray(format) && format.length && !isFunction(format[0])) {
+  } else if (Array.isArray(format) && format.length && !_isFunction(format[0])) {
     nextFormat = format[0];
   } else if (typeof format === 'string') {
     nextFormat = format;
@@ -93,15 +92,17 @@ var RangePicker = props => {
   }
 
   // 返回函数管理起止时间可选范围
-  var rangeRegulator = useDateRange({
+  const rangeRegulator = useDateRange({
     range,
     disabledDate: rest.disabledDate
   });
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var _rest = _objectSpread({}, rest);
+  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  const _rest = {
+    ...rest
+  };
 
   // 处理 presets 配置
-  var finalPresets;
+  let finalPresets;
   if (presets === undefined) {
     // 默认使用预设快捷选项
     finalPresets = getDefaultPresets();
@@ -121,18 +122,18 @@ var RangePicker = props => {
   }
 
   // 字符串时间格式兼容（与 DatePicker 一致：优先按 nextFormat 严格解析）
-  if (Array.isArray(_rest.value) && isString(_rest.value[0]) && isString(_rest.value[1])) {
-    var parseRangeString = s => {
-      if (nextFormat && !isFunction(format)) {
-        var parsed = dayjs(s, nextFormat, true);
+  if (Array.isArray(_rest.value) && _isString(_rest.value[0]) && _isString(_rest.value[1])) {
+    const parseRangeString = s => {
+      if (nextFormat && !_isFunction(format)) {
+        const parsed = dayjs(s, nextFormat, true);
         if (parsed.isValid()) return parsed;
       }
       return dayjs(s);
     };
     _rest.value = [parseRangeString(_rest.value[0]), parseRangeString(_rest.value[1])];
   }
-  var tempFormat;
-  if (isFunction(format)) {
+  let tempFormat;
+  if (_isFunction(format)) {
     tempFormat = [];
   } else if (valueType === 'dateTime') {
     tempFormat = ['YYYY-MM-DD HH:mm:ss'];
@@ -148,33 +149,33 @@ var RangePicker = props => {
   } else {
     tempFormat = [getDefaultFormat(rest.picker)];
   }
-  var _format = uniq([...tempFormat, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
-  var _defaultShowTime = {
+  const _format = _uniq([...tempFormat, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
+  const _defaultShowTime = {
     format: 'HH:mm:ss'
   };
   if (isView) {
-    var _rest$value = _rest.value,
-      value = _rest$value === void 0 ? [] : _rest$value;
-    var viewChildren = null;
+    const {
+      value = []
+    } = _rest;
+    let viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
     } else if (valueType === 'dateTime' || valueType === 'date' || valueType === 'dateStartEndTime') {
-      var vf = nextFormat || 'YYYY-MM-DD';
+      const vf = nextFormat || 'YYYY-MM-DD';
       viewChildren = `${value[0].format(vf)} ${separator} ${value[1].format(vf)}`;
     } else if (Array.isArray(format)) {
-      var formattedList = format.map((formatItem, index) => {
-        var _format2, _ref2;
-        if (isFunction(formatItem)) {
+      const formattedList = format.map((formatItem, index) => {
+        if (_isFunction(formatItem)) {
           return formatItem(value[index]);
         }
-        return ((_format2 = (_ref2 = value[index]).format) === null || _format2 === void 0 ? void 0 : _format2.call(_ref2, formatItem)) || value[index];
+        return value[index].format?.(formatItem) || value[index];
       });
       viewChildren = formattedList.join(separator);
-    } else if (isFunction(format)) {
+    } else if (_isFunction(format)) {
       viewChildren = `${format(value[0])} ${separator} ${format(value[1])}`;
     } else {
-      var _vf = (typeof format === 'string' ? format : nextFormat) || 'YYYY-MM-DD';
-      viewChildren = `${value[0].format(_vf)} ${separator} ${value[1].format(_vf)}`;
+      const vf = (typeof format === 'string' ? format : nextFormat) || 'YYYY-MM-DD';
+      viewChildren = `${value[0].format(vf)} ${separator} ${value[1].format(vf)}`;
     }
     return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
@@ -182,14 +183,19 @@ var RangePicker = props => {
     });
   }
   if (_rest.showTime === true) {
-    _rest.showTime = _objectSpread({}, _defaultShowTime);
+    _rest.showTime = {
+      ..._defaultShowTime
+    };
   }
-  if (isObject(_rest.showTime)) {
+  if (_isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return /*#__PURE__*/_jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_rest, ['separator'])), rangeRegulator), {}, {
+  return /*#__PURE__*/_jsx(AntRangePicker, {
+    ...initialConfig,
+    ..._omit(_rest, ['separator']),
+    ...rangeRegulator,
     format: _format,
     presets: finalPresets
-  }));
+  });
 };
 export default RangePicker;

package/es/ProForm/components/base/RangePicker/useDateRange.js

@@ -1,37 +1,29 @@
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useState } from 'react';
 /**
  * 支持传入时间范围作为起止期的间隔时间
  */
-export var useDateRange = props => {
-  var range = props.range,
-    _disabledDate = props.disabledDate;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    dates = _useState2[0],
-    setDates = _useState2[1];
+export const useDateRange = props => {
+  const {
+    range,
+    disabledDate
+  } = props;
+  const [dates, setDates] = useState([]);
   if (!range) return;
   return {
     onCalendarChange: val => {
-      var _val$, _val$2;
       if (!val) {
         setDates(val);
         return;
       }
-      var _val = [(_val$ = val[0]) === null || _val$ === void 0 ? void 0 : _val$.clone().startOf('day'), (_val$2 = val[1]) === null || _val$2 === void 0 ? void 0 : _val$2.clone().startOf('day')];
+      const _val = [val[0]?.clone().startOf('day'), val[1]?.clone().startOf('day')];
       setDates(_val);
     },
     disabledDate: current => {
       if (!dates) return false;
-      var _current = current.clone().startOf('day');
-      var tooLate = dates[0] && _current.diff(dates[0], range[1]) >= range[0];
-      var tooEarly = dates[1] && dates[1].diff(_current, range[1]) >= range[0];
-      var outerDisableDate = _disabledDate === null || _disabledDate === void 0 ? void 0 : _disabledDate(current);
+      const _current = current.clone().startOf('day');
+      const tooLate = dates[0] && _current.diff(dates[0], range[1]) >= range[0];
+      const tooEarly = dates[1] && dates[1].diff(_current, range[1]) >= range[0];
+      const outerDisableDate = disabledDate?.(current);
       return !!tooEarly || !!tooLate || outerDisableDate;
     }
   };

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

@@ -1,48 +1,41 @@
-var _excluded = ["dataSource", "fieldNames", "otherProps", "scrollFollowParent"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import _isNumber from "lodash/isNumber";
 import { Select as AntSelect, Tooltip } from 'antd';
 import React, { useCallback } from 'react';
-import { isNumber } from 'lodash';
 import Container from "../../Container";
 import { useProConfig } from "../../../../ProConfigProvider";
 import locale from "../../../../locale";
 import ProForm from "../../../index";
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-var 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 = _objectWithoutProperties(props, _excluded);
-  var _ref = ProForm.useFieldProps() || {},
-    isViewCon = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+const Select = props => {
+  const {
+    dataSource = [],
+    fieldNames,
+    otherProps,
+    scrollFollowParent = true,
+    ...rest
+  } = props;
+  const {
+    isView: isViewCon,
+    viewEmpty
+  } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
 
-  var initialConfig = useProConfig('Select') || {};
-  var _fieldNames = fieldNames || initialConfig.fieldNames || {
+  const initialConfig = useProConfig('Select') || {};
+  const _fieldNames = fieldNames || initialConfig.fieldNames || {
     label: 'label',
     value: 'value'
   };
 
   // 使用原生maxTagPlaceholder实现hover提示
-  var maxTagPlaceholder = useCallback(omittedValues => {
+  const maxTagPlaceholder = useCallback(omittedValues => {
     // 提取被省略的标签文本
-    var omittedLabels = omittedValues.map(value => {
+    const omittedLabels = omittedValues.map(value => {
       // value可能是对象形式（labelInValue模式）或简单值
-      var targetValue = typeof value === 'object' ? value.value : value;
-      var item = dataSource.find(item => item[_fieldNames.value] === targetValue);
-      return (item === null || item === void 0 ? void 0 : item[_fieldNames.label]) || targetValue;
+      const targetValue = typeof value === 'object' ? value.value : value;
+      const item = dataSource.find(item => item[_fieldNames.value] === targetValue);
+      return item?.[_fieldNames.label] || targetValue;
     });
-    var tooltipContent = omittedLabels.join('、');
+    const tooltipContent = omittedLabels.join('、');
     return /*#__PURE__*/_jsx(Tooltip, {
       title: tooltipContent,
       children: /*#__PURE__*/_jsxs("span", {
@@ -51,28 +44,29 @@ var Select = props => {
     });
   }, [dataSource, _fieldNames]);
   if (isView) {
-    var value = rest.value,
-      maxTagCount = rest.maxTagCount;
-    var transToLabel = value => {
-      var labelList = value.map(item => {
-        var _dataSource$find;
-        return (_dataSource$find = dataSource.find(dataItem => {
+    const {
+      value,
+      maxTagCount
+    } = rest;
+    const transToLabel = value => {
+      const labelList = value.map(item => {
+        return dataSource.find(dataItem => {
           return dataItem[_fieldNames.value] === item;
-        })) === null || _dataSource$find === void 0 ? void 0 : _dataSource$find[_fieldNames.label];
+        })?.[_fieldNames.label];
       });
       return labelList.join('、');
     };
     if (Array.isArray(value)) {
       // 如果设置了maxTagCount且超出数量，需要截断显示
-      var shouldTruncate = typeof maxTagCount === 'number' && value.length > maxTagCount;
+      const shouldTruncate = typeof maxTagCount === 'number' && value.length > maxTagCount;
       if (shouldTruncate) {
         // 截断显示：显示前N项 + "更多N项..."
-        var visibleItems = value.slice(0, maxTagCount);
-        var hiddenItems = value.slice(maxTagCount);
-        var hiddenCount = value.length - maxTagCount;
-        var visibleText = transToLabel(visibleItems);
-        var hiddenText = transToLabel(hiddenItems); // 只显示被隐藏的标签
-        var moreText = locale.ProForm.moreItems.replace('{count}', hiddenCount.toString());
+        const visibleItems = value.slice(0, maxTagCount);
+        const hiddenItems = value.slice(maxTagCount);
+        const hiddenCount = value.length - maxTagCount;
+        const visibleText = transToLabel(visibleItems);
+        const hiddenText = transToLabel(hiddenItems); // 只显示被隐藏的标签
+        const moreText = locale.ProForm.moreItems.replace('{count}', hiddenCount.toString());
         return /*#__PURE__*/_jsxs(Container, {
           viewEmpty: viewEmpty,
           children: [visibleText, "\u3001", /*#__PURE__*/_jsx(Tooltip, {
@@ -92,22 +86,22 @@ var Select = props => {
     }
     return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
-      children: value || isNumber(value) ? transToLabel([value]) : null
+      children: value || _isNumber(value) ? transToLabel([value]) : null
     });
   }
-  return /*#__PURE__*/_jsx(AntSelect, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(AntSelect, {
     placeholder: `${locale.ProForm.selectPlaceHolder}`,
     allowClear: true,
     getPopupContainer: trigger => {
       return scrollFollowParent ? trigger.parentElement : document.body;
-    }
-  }, initialConfig), {}, {
-    options: dataSource
-  }, rest), {}, {
+    },
+    ...initialConfig,
+    options: dataSource,
+    ...rest,
     // 如果是多选模式且用户没有自定义maxTagPlaceholder，使用我们的hover版本
     maxTagPlaceholder: rest.mode === 'multiple' && !rest.maxTagPlaceholder ? maxTagPlaceholder : rest.maxTagPlaceholder,
     value: rest.value === '' ? null : rest.value,
     fieldNames: _fieldNames
-  }));
+  });
 };
 export default Select;

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

@@ -1,31 +1,27 @@
-var _excluded = ["disabled", "otherProps"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import _isUndefined from "lodash/isUndefined";
+import _isNull from "lodash/isNull";
 import { Switch as AntSwitch } from 'antd';
 import React from 'react';
-import { isNull, isUndefined } from 'lodash';
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-var Switch = props => {
-  var disabled = props.disabled,
-    otherProps = props.otherProps,
-    res = _objectWithoutProperties(props, _excluded);
-  var _ref = ProForm.useFieldProps() || {},
-    isViewCon = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    valueType = _ref.valueType;
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var config = useProConfig('Switch');
+const Switch = props => {
+  const {
+    disabled,
+    otherProps,
+    ...res
+  } = props;
+  const {
+    isView: isViewCon,
+    viewEmpty,
+    valueType
+  } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  const config = useProConfig('Switch');
   if (isView) {
-    if (isUndefined(res === null || res === void 0 ? void 0 : res.checked) || isNull(res === null || res === void 0 ? void 0 : res.checked) || valueType === 'switch' && isUndefined(res.value)) {
+    if (_isUndefined(res?.checked) || _isNull(res?.checked) || valueType === 'switch' && _isUndefined(res.value)) {
       return /*#__PURE__*/_jsx(_Fragment, {
         children: viewEmpty
       });
@@ -35,12 +31,13 @@ var Switch = props => {
       children: res.checked === true ? `${locale.ProForm.switchText[0]}` : `${locale.ProForm.switchText[1]}`
     });
   }
-  return /*#__PURE__*/_jsx(AntSwitch, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(AntSwitch, {
     disabled: disabled,
     checkedChildren: `${locale.ProForm.switchText[0]}`,
-    unCheckedChildren: `${locale.ProForm.switchText[1]}`
-  }, config), res), {}, {
+    unCheckedChildren: `${locale.ProForm.switchText[1]}`,
+    ...config,
+    ...res,
     id: "switch_only" // 解决点击label联动的问题
-  }));
+  });
 };
 export default Switch;

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

@@ -1,37 +1,33 @@
-var _excluded = ["onChange", "disabled", "value", "otherProps", "className"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import _isUndefined from "lodash/isUndefined";
+import _isNull from "lodash/isNull";
 import * as React from 'react';
 import { Checkbox } from 'antd';
-import { isNull, isUndefined } from 'lodash';
 import classnames from 'classnames';
 import { useProConfig } from "../../../../ProConfigProvider";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-var SwitchCheckbox = props => {
-  var onChange = props.onChange,
-    disabled = props.disabled,
-    value = props.value,
-    otherProps = props.otherProps,
-    className = props.className,
-    restProps = _objectWithoutProperties(props, _excluded);
-  var _ref = ProForm.useFieldProps() || {},
-    isViewCon = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    valueType = _ref.valueType;
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var initialConfig = useProConfig('SwitchCheckbox');
-  var changeVal = e => {
+const SwitchCheckbox = props => {
+  const {
+    onChange,
+    disabled,
+    value,
+    otherProps,
+    className,
+    ...restProps
+  } = props;
+  const {
+    isView: isViewCon,
+    viewEmpty,
+    valueType
+  } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  const initialConfig = useProConfig('SwitchCheckbox');
+  const changeVal = e => {
     onChange(e.target.checked);
   };
   if (isView) {
-    if (isUndefined(restProps.checked) || isNull(restProps.checked) || valueType === 'switch' && isUndefined(value)) {
+    if (_isUndefined(restProps.checked) || _isNull(restProps.checked) || valueType === 'switch' && _isUndefined(value)) {
       return /*#__PURE__*/_jsxs("span", {
         className: "switch-checkbox-view",
         children: [/*#__PURE__*/_jsx("span", {
@@ -54,16 +50,17 @@ var SwitchCheckbox = props => {
       })]
     });
   }
-  var classNames = classnames({
+  const classNames = classnames({
     'pro-switch-checkbox': true,
     className
   });
-  return /*#__PURE__*/_jsx(Checkbox, _objectSpread(_objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Checkbox, {
     disabled: disabled,
     onChange: changeVal,
-    className: classNames
-  }, initialConfig), restProps), {}, {
+    className: classNames,
+    ...initialConfig,
+    ...restProps,
     children: restProps.label
-  }));
+  });
 };
 export default SwitchCheckbox;

package/es/ProForm/components/base/SwitchCheckbox/style/index.less

@@ -1,13 +1,12 @@
-
 .switch-checkbox-view {
-  display    : flex;
+  display: flex;
   align-items: center;
 
   .switch-checkbox-view-label {
-    flex         : 0 0 @zaui-form-label-width;
-    overflow   : initial;
+    flex: 0 0 @zaui-form-label-width;
+    overflow: initial;
     line-height: 1;
     white-space: pre-wrap;
-    color      : var(--zaui-aide-text, #939599);
+    color: var(--zaui-aide-text, #939599);
   }
 }