@zat-design/sisyphus-react 3.13.13 → 4.0.0-beta.2

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

@@ -1,28 +1,9 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
-.border-radius(@start-end: 0, @end-end: 0, @start-start: 0, @end-start: 0) {
-  border-start-end-radius: @start-end;
-  border-end-end-radius: @end-end;
-  border-start-start-radius: @start-start;
-  border-end-start-radius: @end-start;
-}
-
-.start-radius() {
-  border-start-start-radius: 4px;
-  border-end-start-radius: 4px;
-}
-
-.end-radius() {
-  border-start-end-radius: 4px;
-  border-end-end-radius: 4px;
-}
-
 .pro-group {
-  width: unset !important;
   display: flex;
+  width: unset !important;
 
-  &.pro-group-diy-width, &.pro-group-width-auto {
+  &.pro-group-diy-width,
+  &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {
       width: auto;
 
@@ -53,94 +34,33 @@
     align-items: center;
     width: 100%;
 
-    &>.@{ant-prefix}-input-number{
-      &:first-child{
-        border-end-end-radius: 0;
-        border-start-end-radius: 0;
-      }
-      &:last-child{
-        border-start-start-radius: 0;
-        border-end-start-radius: 0;
-        margin-left: -1px;
-      }
-    }
-
     .@{ant-prefix}-form-item {
       margin-bottom: 0 !important;
     }
 
     .group-separator {
-      margin-inline-end: -2px;
-      margin-inline-start: -1px;
-      border-start-start-radius: 0;
-      border-end-start-radius: 0;
       padding: 0 12px;
       background-color: #fff;
       cursor: default;
+      margin-inline-end: -2px;
+      margin-inline-start: -1px;
     }
     .pro-modal-select {
       margin-left: -1px;
-      .@{ant-prefix}-input{
-        border-start-start-radius: 0;
-        border-end-start-radius: 0;
-      }
     }
 
     // 定制内敛合并样式
     .@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select {
-      .border-radius(0, 0, 0, 0);
-
       &:nth-child(n + 2) {
         margin-inline-start: -1px;
       }
-
-      &:first-child {
-        .start-radius();
-      }
-
-      &:last-child {
-        .end-radius();
-      }
-    }
-
-    .pro-select {
-      .@{ant-prefix}-select .@{ant-prefix}-select-selector{
-        border-radius: 0 !important;
-      }
-      &:first-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
-        border-start-start-radius: 4px !important;
-        border-end-start-radius: 4px !important;
-      }
-
-      &:last-child   .@{ant-prefix}-select .@{ant-prefix}-select-selector {
-        border-start-end-radius: 4px  !important;
-        border-end-end-radius: 4px!important;
-      }
-    }
-
-    .@{ant-prefix}-select {
-      .@{ant-prefix}-select-selector {
-        .border-radius(0, 0, 0, 0);
-      }
-
-      &:first-child {
-        .@{ant-prefix}-select-selector {
-          .start-radius();
-        }
-      }
-
-      &:last-child {
-        .@{ant-prefix}-select-selector {
-          .end-radius();
-        }
-      }
     }
 
     // 报错样式定制
     .@{ant-prefix}-input-affix-wrapper-status-error ~ .group-separator {
-      color: var(--ant-error-color);
-      border-color: var(--ant-error-color);
+      color: #ff4d4f;
+      border-color: #ff4d4f;
     }
   }
 }

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -37,7 +37,7 @@ interface Params {
 export declare const getReactiveProps: (params: Params) => {
     disabled: boolean;
     show: boolean;
-    component: any;
+    component: import("react").ReactNode;
     fieldProps: boolean;
     desensitization: [number, number];
 };

package/es/ProForm/components/combination/Group/utils.js

@@ -1,10 +1,9 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 import _isFunction from "lodash/isFunction";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { validate } from '@zat-design/utils';
+import { Button } from 'antd';
 import valueTypeMap from '../../../utils/valueType';
 /**
  * 插入间隔符
@@ -37,7 +36,7 @@ export var insertSeparator = function insertSeparator(columns, space) {
         if (index === separatorIndex) {
           result.push({
             separator: true,
-            component: _jsx(_Button, {
+            component: _jsx(Button, {
               className: "group-separator",
               children: space.separator
             }),
@@ -52,7 +51,7 @@ export var insertSeparator = function insertSeparator(columns, space) {
       if (index < array.length - 1) {
         result.push({
           separator: true,
-          component: _jsx(_Button, {
+          component: _jsx(Button, {
             className: "group-separator",
             children: space.separator
           }),
@@ -91,7 +90,7 @@ export var transformNamesString = function transformNamesString(arr) {
  */
 export var isUpperCase = function isUpperCase(type, upperCase) {
   var result = {};
-  if (['Input', 'TextArea', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input', 'TextArea'].includes(type) && upperCase) {
     result.getValueFromEvent = function (event) {
       var _event$target, _event$target$value;
       if (Array.isArray(event)) {

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

@@ -1,22 +1,19 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import "antd/es/cascader/style";
-import _Cascader from "antd/es/cascader";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "antd/es/typography/style";
-import _Typography from "antd/es/typography";
+import _isEqual from "lodash/isEqual";
 import _isBoolean from "lodash/isBoolean";
 import _find2 from "lodash/find";
 import _omit from "lodash/omit";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
+import { Cascader, Tooltip } from 'antd';
 import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Input from '../../base/Input';
@@ -24,7 +21,6 @@ import useEnum from '../../../../ProEnum/hooks/useEnum';
 import locale from '../../../../locale';
 import ProForm from '../../..';
 import Container from '../../Container';
-var Text = _Typography.Text;
 var defaultFieldNames = {
   label: 'name',
   value: 'code',
@@ -133,15 +129,15 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
-            _context.next = 2;
+            _context.n = 1;
             return service(defaultParams);
-          case 2:
-            _yield$service = _context.sent;
+          case 1:
+            _yield$service = _context.v;
             data = _yield$service.data;
             newData = data;
             if (transformResponse) {
@@ -154,9 +150,8 @@ var ProCascader = function ProCascader(props) {
             });
             serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
-          case 9:
-          case "end":
-            return _context.stop();
+          case 2:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -272,7 +267,7 @@ var ProCascader = function ProCascader(props) {
     children: viewValue
   }) : _jsxs("div", {
     className: "pro-address ".concat(className),
-    children: [_jsx(_Cascader, _objectSpread({
+    children: [_jsx(Cascader, _objectSpread({
       className: hasDetail ? '' : 'no-detail',
       placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
@@ -287,7 +282,7 @@ var ProCascader = function ProCascader(props) {
       getPopupContainer: function getPopupContainer(trigger) {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, _omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? _jsx(_Tooltip, {
+    }, _omit(restProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && lastDisabled[1] && detail ? _jsx(Tooltip, {
       title: detail,
       children: _jsx("span", {
         className: "pro-address-detail",
@@ -311,4 +306,10 @@ var ProCascader = function ProCascader(props) {
     }))]
   });
 };
-export default /*#__PURE__*/memo(ProCascader);
+export default /*#__PURE__*/memo(ProCascader, function (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.dataSource, nextProps === null || nextProps === void 0 ? void 0 : nextProps.dataSource)) {
+    return false;
+  }
+  return true;
+});

package/es/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -28,7 +28,7 @@ export interface ProCascaderType {
     transformResponse?: (data: any[]) => any[];
     level?: number;
     enumCode?: string;
-    code?: string;
+    code?: string | string[];
     otherProps?: any;
     /** 查看分隔符 */
     separator?: string;

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

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-address {
   display: flex;

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -1,8 +1,9 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _isEqual from "lodash/isEqual";
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 import { useDebounceFn, usePrevious, useRequest } from 'ahooks';
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import locale, { formatMessage } from '../../../../../locale';
@@ -24,14 +25,11 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          return _context.abrupt("return", {});
-        case 1:
-        case "end":
-          return _context.stop();
+          return _context.a(2, {});
       }
     }, _callee);
   }));

package/es/ProForm/components/combination/ProModalSelect/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { ProModalSelectType } from './propsType';
-declare const _default: React.ForwardRefExoticComponent<Omit<ProModalSelectType, "ref"> & React.RefAttributes<unknown>>;
+declare const _default: React.ForwardRefExoticComponent<Omit<React.PropsWithChildren<ProModalSelectType>, "ref"> & React.RefAttributes<unknown>>;
 export default _default;