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

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

@@ -52,7 +52,7 @@
     }
   }
 
-  .pro-modal-select-view-button{
+  .pro-modal-select-view-button {
     display: flex;
     align-items: center;
     justify-content: center;
@@ -62,10 +62,10 @@
   .@{ant-prefix}-input-affix-wrapper {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
-    &.@{ant-prefix}-input-affix-wrapper-status-error{
-       & + .@{ant-prefix}-btn{
+    &.@{ant-prefix}-input-affix-wrapper-status-error {
+      & + .@{ant-prefix}-btn {
         border: 1px solid #ff4d4f;
-        >.viewSvg{
+        > .viewSvg {
           color: #ff4d4f;
         }
       }
@@ -79,21 +79,25 @@
     }
   }
 
-  .@{ant-prefix}-input-compact-item:not(.@{ant-prefix}-input-compact-last-item):not(.@{ant-prefix}-input-compact-item-rtl){
+  .@{ant-prefix}-input-compact-item:not(.@{ant-prefix}-input-compact-last-item):not(
+      .@{ant-prefix}-input-compact-item-rtl
+    ) {
     margin-right: 0;
   }
 
-  .@{ant-prefix}-btn-compact-item.@{ant-prefix}-btn.@{ant-prefix}-btn-compact-last-item:not(.@{ant-prefix}-btn-compact-first-item):not(.@{ant-prefix}-btn-compact-item-rtl){
-    &:hover{
+  .@{ant-prefix}-btn-compact-item.@{ant-prefix}-btn.@{ant-prefix}-btn-compact-last-item:not(
+      .@{ant-prefix}-btn-compact-first-item
+    ):not(.@{ant-prefix}-btn-compact-item-rtl) {
+    &:hover {
       position: relative;
       z-index: 1;
       transition: none;
       border-color: var(--ant-primary-color-hover, #1677ff) !important;
-      &::before{
+      &::before {
         opacity: 1;
       }
     }
-    &::before{
+    &::before {
       content: '';
       position: absolute;
       top: -1px;
@@ -146,12 +150,12 @@
         border-top: 1px solid #ff4d4f;
         border-right: 1px solid #ff4d4f;
         border-bottom: 1px solid #ff4d4f;
-        >.viewSvg{
+        > .viewSvg {
           color: #ff4d4f;
         }
       }
     }
-    .@{ant-prefix}-btn-compact-last-item{
+    .@{ant-prefix}-btn-compact-last-item {
       border-left: none !important;
     }
   }
@@ -169,13 +173,13 @@
 }
 
 // 报错信息
-.@{ant-prefix}-form-item-has-error{
-  .pro-modal-select{
-    .@{ant-prefix}-btn-compact-last-item{
+.@{ant-prefix}-form-item-has-error {
+  .pro-modal-select {
+    .@{ant-prefix}-btn-compact-last-item {
       color: @zaui-danger;
       border-color: @zaui-danger;
-      &::before{
-      background:  @zaui-danger !important;
+      &::before {
+        background: @zaui-danger !important;
       }
     }
   }

package/es/ProForm/components/combination/ProModalSelect/utils/index.js

@@ -1,24 +1,24 @@
 /* eslint-disable no-restricted-syntax */
-export var hideTooltipIfOpen = (dom, open) => {
+export const hideTooltipIfOpen = (dom, open) => {
   if (!open && document.querySelector('.pro-modal-select-parent-open') && dom) {
-    var _parent = dom.closest('.pro-form-item-changed');
-    var _grandParent = _parent === null || _parent === void 0 ? void 0 : _parent.parentElement;
-    if (_parent) {
-      _parent.className = 'pro-form-item-changed';
+    const parent = dom.closest('.pro-form-item-changed');
+    const grandParent = parent?.parentElement;
+    if (parent) {
+      parent.className = 'pro-form-item-changed';
     }
-    if (_grandParent) {
-      _grandParent.classList.remove('pro-modal-select-parent-open');
+    if (grandParent) {
+      grandParent.classList.remove('pro-modal-select-parent-open');
     }
-    var tooltip = _grandParent === null || _grandParent === void 0 ? void 0 : _grandParent.querySelector('.ant-tooltip');
+    const tooltip = grandParent?.querySelector('.ant-tooltip');
     if (tooltip) {
       tooltip.classList.add('ant-tooltip-hidden');
     }
   }
   if (!dom) return;
-  var modal = dom.className.includes('pro-modal-select-open');
+  const modal = dom.className.includes('pro-modal-select-open');
   if (!modal) return;
-  var parent = dom.closest('.pro-form-item-changed');
-  var grandParent = parent === null || parent === void 0 ? void 0 : parent.parentElement;
+  const parent = dom.closest('.pro-form-item-changed');
+  const grandParent = parent?.parentElement;
   if (open && grandParent) {
     grandParent.classList.add('pro-modal-select-parent-open');
   }

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

@@ -1,17 +1,7 @@
-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 _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 _isEmpty from "lodash/isEmpty";
+import _isEqual from "lodash/isEqual";
 import { useSetState, useDeepCompareEffect } from 'ahooks';
 import { Button, Input, InputNumber, Space } from 'antd';
-import { isEqual, isEmpty } from 'lodash';
 import { memo } from 'react';
 import classnames from 'classnames';
 import { tools } from '@zat-design/utils';
@@ -19,44 +9,44 @@ import Container from "../../Container";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-var formatAmount = tools.formatAmount;
-var ProNumberRange = props => {
-  var _ref2, _valueProps, _ref3, _ref4, _value$, _valueProps2, _ref5, _ref6, _value$2, _valueProps3, _valueProps4;
-  var _props$value = props.value,
-    value = _props$value === void 0 ? [] : _props$value,
-    _props$onChange = props.onChange,
-    onChange = _props$onChange === void 0 ? () => {} : _props$onChange,
-    _props$min = props.min,
-    min = _props$min === void 0 ? 0 : _props$min,
-    max = props.max,
-    className = props.className,
-    disabled = props.disabled,
-    _props$decimal = props.decimal,
-    decimal = _props$decimal === void 0 ? 2 : _props$decimal,
-    precision = props.precision,
-    childProps = props.childProps,
-    addonBefore = props.addonBefore,
-    addonAfter = props.addonAfter,
-    inValueType = props.valueType,
-    separator = props.separator,
-    split = props.split,
-    id = props.id;
-  var _ref = ProForm.useFieldProps() || {},
-    isViewCon = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    valueType = _ref.valueType;
+const {
+  formatAmount
+} = tools;
+const ProNumberRange = props => {
+  const {
+    value = [],
+    onChange = () => {},
+    min = 0,
+    max,
+    className,
+    disabled,
+    decimal = 2,
+    precision,
+    childProps,
+    addonBefore,
+    addonAfter,
+    valueType: inValueType,
+    separator,
+    split,
+    // 弃用属性，保持向后兼容
+    id
+  } = props;
+  const {
+    isView: isViewCon,
+    viewEmpty,
+    valueType
+  } = ProForm.useFieldProps() || {};
 
   // 向后兼容处理：优先使用 separator，如果没有则使用 split，最后使用默认值
-  var finalSeparator = (_ref2 = separator !== null && separator !== void 0 ? separator : split) !== null && _ref2 !== void 0 ? _ref2 : '~';
-  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+  const finalSeparator = separator ?? split ?? '~';
+  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
 
-  var _useSetState = useSetState({
-      range: value || []
-    }),
-    _useSetState2 = _slicedToArray(_useSetState, 2),
-    range = _useSetState2[0].range,
-    setState = _useSetState2[1];
-  var valueProps = {};
+  const [{
+    range
+  }, setState] = useSetState({
+    range: value || []
+  });
+  let valueProps = {};
   useDeepCompareEffect(() => {
     // 同步value值
     if (Array.isArray(value)) {
@@ -65,9 +55,9 @@ var ProNumberRange = props => {
       });
     }
   }, [value]);
-  var firstHandleChange = val => {
+  const firstHandleChange = val => {
     range[0] = val;
-    var isEmptyArray = range.every(item => !item && item !== 0);
+    const isEmptyArray = range.every(item => !item && item !== 0);
     if (isEmptyArray) {
       onChange([]);
     } else {
@@ -77,9 +67,9 @@ var ProNumberRange = props => {
       range
     });
   };
-  var lastHandleChange = val => {
+  const lastHandleChange = val => {
     range[1] = val;
-    var isEmptyArray = range.every(item => !item && item !== 0);
+    const isEmptyArray = range.every(item => !item && item !== 0);
     if (isEmptyArray) {
       onChange([]);
     } else {
@@ -89,7 +79,7 @@ var ProNumberRange = props => {
       range
     });
   };
-  var cls = classnames({
+  const cls = classnames({
     'pro-number-range': true,
     'pro-number-range-disabled': disabled,
     className
@@ -97,7 +87,7 @@ var ProNumberRange = props => {
 
   // 查看模式
   if (isView || props.isView) {
-    if (isEmpty(value) || value !== null && value !== void 0 && value.every(item => typeof item !== 'number')) {
+    if (_isEmpty(value) || value?.every(item => typeof item !== 'number')) {
       return viewEmpty;
     }
     switch (valueType) {
@@ -165,8 +155,8 @@ var ProNumberRange = props => {
         valueProps = {
           formatter: value => {
             return typeof value === 'number' || value ? Number(value).toLocaleString('zh-CN', {
-              minimumFractionDigits: precision !== null && precision !== void 0 ? precision : null,
-              maximumFractionDigits: precision !== null && precision !== void 0 ? precision : 9
+              minimumFractionDigits: precision ?? null,
+              maximumFractionDigits: precision ?? 9
             }) : value;
           },
           parser: value => value.replace(/\$\s?|(,*)/g, '')
@@ -200,8 +190,8 @@ var ProNumberRange = props => {
    * @param disabled 禁用值
    * @param index 位置
    */
-  var getDisabled = (disabled, index) => {
-    var result = disabled;
+  const getDisabled = (disabled, index) => {
+    let result = disabled;
     if (Array.isArray(disabled)) {
       result = disabled[index];
     }
@@ -210,20 +200,21 @@ var ProNumberRange = props => {
   return /*#__PURE__*/_jsx(Space, {
     className: cls,
     children: /*#__PURE__*/_jsxs(Space.Compact, {
-      children: [/*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
+      children: [/*#__PURE__*/_jsx(InputNumber, {
         id: id,
         className: "range-left",
-        value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
+        value: value?.[0] || range[0],
         placeholder: `${locale.ProForm.inputPlaceholder}`,
         precision: precision,
         disabled: getDisabled(disabled, 0),
         onChange: e => {
           firstHandleChange(e);
-        }
-      }, valueProps), {}, {
-        min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
-        max: (_ref3 = (_ref4 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref4 !== void 0 ? _ref4 : max) !== null && _ref3 !== void 0 ? _ref3 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
-      }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? /*#__PURE__*/_jsx(Button, {
+        },
+        ...valueProps,
+        min: min ?? valueProps?.min,
+        max: value?.[1] ?? range[1] ?? max ?? valueProps?.max,
+        ...childProps?.[0]
+      }), addonBefore ? /*#__PURE__*/_jsx(Button, {
         disabled: true,
         className: "range-addon-before",
         children: addonBefore
@@ -234,19 +225,20 @@ var ProNumberRange = props => {
         }),
         placeholder: finalSeparator,
         disabled: true
-      }), /*#__PURE__*/_jsx(InputNumber, _objectSpread(_objectSpread({
+      }), /*#__PURE__*/_jsx(InputNumber, {
         className: "range-right",
-        value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
+        value: value?.[1] || range[1],
         placeholder: `${locale.ProForm.inputPlaceholder}`,
         precision: precision,
         disabled: getDisabled(disabled, 1),
         onChange: e => {
           lastHandleChange(e);
-        }
-      }, valueProps), {}, {
-        min: (_ref5 = (_ref6 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref6 !== void 0 ? _ref6 : min) !== null && _ref5 !== void 0 ? _ref5 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
-        max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
-      }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? /*#__PURE__*/_jsx(Button, {
+        },
+        ...valueProps,
+        min: value?.[0] ?? range[0] ?? min ?? valueProps?.min,
+        max: max ?? valueProps?.max,
+        ...childProps?.[1]
+      }), addonAfter ? /*#__PURE__*/_jsx(Button, {
         disabled: true,
         className: "range-addon-after",
         children: addonAfter
@@ -256,7 +248,7 @@ var ProNumberRange = props => {
 };
 export default /*#__PURE__*/memo(ProNumberRange, (prevProps, nextProps) => {
   // 基本props比较 只比较关键的
-  if (!isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.value, nextProps === null || nextProps === void 0 ? void 0 : nextProps.value) || (prevProps === null || prevProps === void 0 ? void 0 : prevProps.disabled) !== (nextProps === null || nextProps === void 0 ? void 0 : nextProps.disabled) || !isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.childProps, nextProps === null || nextProps === void 0 ? void 0 : nextProps.childProps)) {
+  if (!_isEqual(prevProps?.value, nextProps?.value) || prevProps?.disabled !== nextProps?.disabled || !_isEqual(prevProps?.childProps, nextProps?.childProps)) {
     return false;
   }
   return true;

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

@@ -16,9 +16,9 @@
     }
   }
 
-  .@{ant-prefix}-input-number.@{ant-prefix}-input-number-status-error.@{ant-prefix}-input-number-compact-item{
-    .@{ant-prefix}-input-number-input{
-    border-left: 0 !important;
+  .@{ant-prefix}-input-number.@{ant-prefix}-input-number-status-error.@{ant-prefix}-input-number-compact-item {
+    .@{ant-prefix}-input-number-input {
+      border-left: 0 !important;
     }
   }