@zat-design/sisyphus-react 3.5.1-beta.15 → 3.5.1-beta.17

package/dist/index.esm.css

@@ -2497,12 +2497,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   cursor: pointer;
   fill: #c5c7cd;
 }
-.pro-modal-select .ant-select-status-error + .ant-btn,
-.pro-tree-modal .ant-select-status-error + .ant-btn {
-  border: 1px solid var(--ant-error-color);
-}
-.pro-modal-select .ant-select-status-error + .ant-btn > .viewSvg,
-.pro-tree-modal .ant-select-status-error + .ant-btn > .viewSvg {
+.pro-modal-select .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item,
+.pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item {
+  border-top: 1px solid var(--ant-error-color);
+  border-right: 1px solid var(--ant-error-color);
+  border-bottom: 1px solid var(--ant-error-color);
+}
+.pro-modal-select .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg,
+.pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg {
   color: var(--ant-error-color);
 }
 .pro-modal-select .ant-input-group-addon,

package/dist/less.esm.css

@@ -2497,12 +2497,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   cursor: pointer;
   fill: #c5c7cd;
 }
-.pro-modal-select .ant-select-status-error + .ant-btn,
-.pro-tree-modal .ant-select-status-error + .ant-btn {
-  border: 1px solid var(--ant-error-color);
-}
-.pro-modal-select .ant-select-status-error + .ant-btn > .viewSvg,
-.pro-tree-modal .ant-select-status-error + .ant-btn > .viewSvg {
+.pro-modal-select .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item,
+.pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item {
+  border-top: 1px solid var(--ant-error-color);
+  border-right: 1px solid var(--ant-error-color);
+  border-bottom: 1px solid var(--ant-error-color);
+}
+.pro-modal-select .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg,
+.pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg {
   color: var(--ant-error-color);
 }
 .pro-modal-select .ant-input-group-addon,

package/es/ProEnum/propsType.d.ts

@@ -75,6 +75,7 @@ export interface ProEnum {
     /** 支持 {label:xx, value: xx} */
     labelInValue?: boolean;
     otherProps?: ProFormOtherProps;
+    allowClear?: boolean;
 }
 export type PropProSelectsMap = {
     type?: 'ProSelect';

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

@@ -107,13 +107,18 @@
     fill: #c5c7cd;
   }
 
-  .@{ant-prefix}-select-status-error {
-    & + .@{ant-prefix}-btn{
-      border: 1px solid var(--ant-error-color);
-      >.viewSvg{
-        color: var(--ant-error-color);
+  .@{ant-prefix}-space-compact {
+    .@{ant-prefix}-select-compact-item-div:has(.@{ant-prefix}-select-status-error) {
+      & + .ant-btn-compact-last-item {
+        border-top: 1px solid var(--ant-error-color);
+        border-right: 1px solid var(--ant-error-color);
+        border-bottom: 1px solid var(--ant-error-color);
+        >.viewSvg{
+          color: var(--ant-error-color);
+        }
       }
     }
+    
   }
 
   .@{ant-prefix}-input-group-addon {

package/es/ProForm/utils/useForm.js

@@ -34,6 +34,7 @@ export var useForm = function useForm(originForm) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        _error$errorFields,
         _error$errorFields$,
         _args = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -80,7 +81,7 @@ export var useForm = function useForm(originForm) {
           case 17:
             _context.prev = 17;
             _context.t0 = _context["catch"](0);
-            if (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields) {
+            if (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length) {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'

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

@@ -52,9 +52,9 @@ var OpenMenu = function OpenMenu(props) {
     }
     var menuDeep = function menuDeep(data) {
       data.forEach(function (item) {
-        var _item$children;
+        var _item$keyIdPath, _item$keyIdPath2, _item$children;
         // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
-        var isFirstMenu = item.keyIdPath.length === 1 || sideMenu && item.keyIdPath.length === 2;
+        var isFirstMenu = ((_item$keyIdPath = item.keyIdPath) === null || _item$keyIdPath === void 0 ? void 0 : _item$keyIdPath.length) === 1 || sideMenu && ((_item$keyIdPath2 = item.keyIdPath) === null || _item$keyIdPath2 === void 0 ? void 0 : _item$keyIdPath2.length) === 2;
         // 第一级菜单显示icon
         item.label = _jsxs("div", {
           className: classnames({

package/es/ProStep/components/Anchor/index.js

@@ -38,7 +38,9 @@ export var MenuItem = function MenuItem(props) {
     isChecked = props.isChecked,
     errorNum = props.errorNum,
     currentNum = props.currentNum,
-    targetOffset = props.targetOffset;
+    targetOffset = props.targetOffset,
+    _props$scrollToError = props.scrollToError,
+    scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError;
   var renderMenuIcon = function renderMenuIcon() {
     if (isCurrentStep) {
       return _jsx("span", {
@@ -77,7 +79,8 @@ export var MenuItem = function MenuItem(props) {
     }),
     onClick: function onClick() {
       handleScroll(code, {
-        targetOffset: targetOffset
+        targetOffset: targetOffset,
+        scrollToError: scrollToError
       });
     },
     children: [_jsxs("div", {

package/es/ProStep/components/Step/index.d.ts

@@ -1,5 +1,5 @@
 import { ProStepPropsType } from '../../propsType';
-export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, }: ProStepPropsType & {
+export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, scrollToError, }: ProStepPropsType & {
     errorCollection: object;
 }) => JSX.Element;
 export default Step;

package/es/ProStep/components/Step/index.js

@@ -15,7 +15,8 @@ export var Step = function Step(_ref) {
     activeKey = _ref.activeKey,
     errorCollection = _ref.errorCollection,
     style = _ref.style,
-    targetOffset = _ref.targetOffset;
+    targetOffset = _ref.targetOffset,
+    scrollToError = _ref.scrollToError;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     onOff = _useState2[0],
@@ -69,6 +70,7 @@ export var Step = function Step(_ref) {
     }), options.map(function (item) {
       return _jsx(React.Fragment, {
         children: _jsx(Anchor, _objectSpread(_objectSpread({}, item), {}, {
+          scrollToError: scrollToError,
           onOff: onOff
         }))
       }, item.code);

package/es/ProStep/index.js

@@ -39,7 +39,9 @@ var ProStep = function ProStep(_ref) {
     setLocalData = _useLocalStorageState2[1];
   var targetOffset = resetProps.targetOffset,
     _resetProps$collapse = resetProps.collapse,
-    collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse;
+    collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
+    _resetProps$scrollToE = resetProps.scrollToError,
+    scrollToError = _resetProps$scrollToE === void 0 ? true : _resetProps$scrollToE;
   var values = {};
   var dataSource = useMemo(function () {
     var _Object$entries, _Object$entries$map;
@@ -173,7 +175,8 @@ var ProStep = function ProStep(_ref) {
         return errorCollection[moduleKey];
       })) === null || _dataSource$find === void 0 ? void 0 : _dataSource$find.code;
       firstErrorModuleKey && handleScroll(firstErrorModuleKey, {
-        targetOffset: targetOffset
+        targetOffset: targetOffset,
+        scrollToError: scrollToError
       });
     }
   }, [errorCollection, dataSource]);

package/es/ProStep/propsType.d.ts

@@ -19,6 +19,8 @@ export interface ProStepPropsType {
     targetOffset?: number;
     /** @name 是否使用折叠标题 */
     collapse?: boolean;
+    /** @name 是否滚动到第一个报错 */
+    scrollToError?: boolean;
 }
 export interface ProStepItem {
     id: string;

package/es/ProStep/utils/index.js

@@ -2,7 +2,9 @@ import { debounce } from 'lodash';
 export var handleScroll = function handleScroll(id, options) {
   var _ref = options || {},
     _ref$targetOffset = _ref.targetOffset,
-    targetOffset = _ref$targetOffset === void 0 ? 0 : _ref$targetOffset;
+    targetOffset = _ref$targetOffset === void 0 ? 0 : _ref$targetOffset,
+    scrollToError = _ref.scrollToError;
+  if (!scrollToError) return;
   var dom = document.querySelector("#".concat(id));
   if (dom) {
     setTimeout(debounce(function () {

package/lib/ProEnum/propsType.d.ts

@@ -75,6 +75,7 @@ export interface ProEnum {
     /** 支持 {label:xx, value: xx} */
     labelInValue?: boolean;
     otherProps?: ProFormOtherProps;
+    allowClear?: boolean;
 }
 export type PropProSelectsMap = {
     type?: 'ProSelect';

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

@@ -107,13 +107,18 @@
     fill: #c5c7cd;
   }
 
-  .@{ant-prefix}-select-status-error {
-    & + .@{ant-prefix}-btn{
-      border: 1px solid var(--ant-error-color);
-      >.viewSvg{
-        color: var(--ant-error-color);
+  .@{ant-prefix}-space-compact {
+    .@{ant-prefix}-select-compact-item-div:has(.@{ant-prefix}-select-status-error) {
+      & + .ant-btn-compact-last-item {
+        border-top: 1px solid var(--ant-error-color);
+        border-right: 1px solid var(--ant-error-color);
+        border-bottom: 1px solid var(--ant-error-color);
+        >.viewSvg{
+          color: var(--ant-error-color);
+        }
       }
     }
+    
   }
 
   .@{ant-prefix}-input-group-addon {

package/lib/ProForm/utils/useForm.js

@@ -40,6 +40,7 @@ var useForm = exports.useForm = function useForm(originForm) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        _error$errorFields,
         _error$errorFields$,
         _args = arguments;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -86,7 +87,7 @@ var useForm = exports.useForm = function useForm(originForm) {
           case 17:
             _context.prev = 17;
             _context.t0 = _context["catch"](0);
-            if (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.errorFields) {
+            if (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length) {
               form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'

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

@@ -58,9 +58,9 @@ var OpenMenu = function OpenMenu(props) {
     }
     var menuDeep = function menuDeep(data) {
       data.forEach(function (item) {
-        var _item$children;
+        var _item$keyIdPath, _item$keyIdPath2, _item$children;
         // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
-        var isFirstMenu = item.keyIdPath.length === 1 || sideMenu && item.keyIdPath.length === 2;
+        var isFirstMenu = ((_item$keyIdPath = item.keyIdPath) === null || _item$keyIdPath === void 0 ? void 0 : _item$keyIdPath.length) === 1 || sideMenu && ((_item$keyIdPath2 = item.keyIdPath) === null || _item$keyIdPath2 === void 0 ? void 0 : _item$keyIdPath2.length) === 2;
         // 第一级菜单显示icon
         item.label = (0, _jsxRuntime.jsxs)("div", {
           className: (0, _classnames2.default)({

package/lib/ProStep/components/Anchor/index.js

@@ -45,7 +45,9 @@ var MenuItem = exports.MenuItem = function MenuItem(props) {
     isChecked = props.isChecked,
     errorNum = props.errorNum,
     currentNum = props.currentNum,
-    targetOffset = props.targetOffset;
+    targetOffset = props.targetOffset,
+    _props$scrollToError = props.scrollToError,
+    scrollToError = _props$scrollToError === void 0 ? true : _props$scrollToError;
   var renderMenuIcon = function renderMenuIcon() {
     if (isCurrentStep) {
       return (0, _jsxRuntime.jsx)("span", {
@@ -84,7 +86,8 @@ var MenuItem = exports.MenuItem = function MenuItem(props) {
     }),
     onClick: function onClick() {
       (0, _utils.handleScroll)(code, {
-        targetOffset: targetOffset
+        targetOffset: targetOffset,
+        scrollToError: scrollToError
       });
     },
     children: [(0, _jsxRuntime.jsxs)("div", {

package/lib/ProStep/components/Step/index.d.ts

@@ -1,5 +1,5 @@
 import { ProStepPropsType } from '../../propsType';
-export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, }: ProStepPropsType & {
+export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, scrollToError, }: ProStepPropsType & {
     errorCollection: object;
 }) => JSX.Element;
 export default Step;

package/lib/ProStep/components/Step/index.js

@@ -23,7 +23,8 @@ var Step = exports.Step = function Step(_ref) {
     activeKey = _ref.activeKey,
     errorCollection = _ref.errorCollection,
     style = _ref.style,
-    targetOffset = _ref.targetOffset;
+    targetOffset = _ref.targetOffset,
+    scrollToError = _ref.scrollToError;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     onOff = _useState2[0],
@@ -77,6 +78,7 @@ var Step = exports.Step = function Step(_ref) {
     }), options.map(function (item) {
       return (0, _jsxRuntime.jsx)(_react.default.Fragment, {
         children: (0, _jsxRuntime.jsx)(_Anchor.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+          scrollToError: scrollToError,
           onOff: onOff
         }))
       }, item.code);

package/lib/ProStep/index.js

@@ -46,7 +46,9 @@ var ProStep = function ProStep(_ref) {
     setLocalData = _useLocalStorageState2[1];
   var targetOffset = resetProps.targetOffset,
     _resetProps$collapse = resetProps.collapse,
-    collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse;
+    collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
+    _resetProps$scrollToE = resetProps.scrollToError,
+    scrollToError = _resetProps$scrollToE === void 0 ? true : _resetProps$scrollToE;
   var values = {};
   var dataSource = (0, _react.useMemo)(function () {
     var _Object$entries, _Object$entries$map;
@@ -180,7 +182,8 @@ var ProStep = function ProStep(_ref) {
         return errorCollection[moduleKey];
       })) === null || _dataSource$find === void 0 ? void 0 : _dataSource$find.code;
       firstErrorModuleKey && (0, _utils.handleScroll)(firstErrorModuleKey, {
-        targetOffset: targetOffset
+        targetOffset: targetOffset,
+        scrollToError: scrollToError
       });
     }
   }, [errorCollection, dataSource]);

package/lib/ProStep/propsType.d.ts

@@ -19,6 +19,8 @@ export interface ProStepPropsType {
     targetOffset?: number;
     /** @name 是否使用折叠标题 */
     collapse?: boolean;
+    /** @name 是否滚动到第一个报错 */
+    scrollToError?: boolean;
 }
 export interface ProStepItem {
     id: string;

package/lib/ProStep/utils/index.js

@@ -8,7 +8,9 @@ var _lodash = require("lodash");
 var handleScroll = exports.handleScroll = function handleScroll(id, options) {
   var _ref = options || {},
     _ref$targetOffset = _ref.targetOffset,
-    targetOffset = _ref$targetOffset === void 0 ? 0 : _ref$targetOffset;
+    targetOffset = _ref$targetOffset === void 0 ? 0 : _ref$targetOffset,
+    scrollToError = _ref.scrollToError;
+  if (!scrollToError) return;
   var dom = document.querySelector("#".concat(id));
   if (dom) {
     setTimeout((0, _lodash.debounce)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.1-beta.15",
+  "version": "3.5.1-beta.17",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",