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

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

@@ -1,6 +1,5 @@
-import React from 'react';
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classnames from 'classnames';
-import packImg from '../../../images/pack.png';
 import OpenMenu from './OpenMenu';
 import FoldMenu from './FoldMenu'; // 折叠后菜单
 var Menu = function Menu(props) {
@@ -10,7 +9,8 @@ var Menu = function Menu(props) {
     collapsed = props.collapsed,
     notice = props.notice,
     onToggle = props.onToggle,
-    pure = props.pure;
+    pure = props.pure,
+    theme = props.theme;
   var menus = [];
   var menuCls = classnames({
     'pro-layout-menu': true,
@@ -22,41 +22,43 @@ var Menu = function Menu(props) {
     menus = dataSource === null || dataSource === void 0 ? void 0 : dataSource.menus;
   }
   if (pure.leftMenu || pure === true) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null);
+    return _jsx(_Fragment, {});
   }
-  return /*#__PURE__*/React.createElement("div", {
+  return _jsxs("div", {
     className: menuCls,
     style: {
       top: notice ? 80 + headerHeight - 48 : headerHeight
-    }
-  }, /*#__PURE__*/React.createElement(OpenMenu, {
-    dataSource: {
-      menus: menus,
-      iconfontUrl: iconfontUrl,
-      height: headerHeight + (notice ? 32 : 0) + 48
     },
-    style: {
-      display: collapsed ? 'block' : 'none'
-    }
-  }), /*#__PURE__*/React.createElement(FoldMenu, {
-    dataSource: {
-      menus: menus,
-      iconfontUrl: iconfontUrl,
-      height: headerHeight + (notice ? 32 : 0) + 48,
-      notice: notice,
-      collapsed: collapsed,
-      headerHeight: headerHeight
-    },
-    style: {
-      display: collapsed ? 'none' : 'block',
-      height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0) + 48 || 0, "px)")
-    }
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "pro-layout-menu-collapsed",
-    onClick: onToggle
-  }, /*#__PURE__*/React.createElement("img", {
-    src: packImg,
-    alt: "pack"
-  })));
+    children: [_jsx(OpenMenu, {
+      dataSource: {
+        menus: menus,
+        iconfontUrl: iconfontUrl,
+        height: headerHeight + (notice ? 32 : 0) + 48
+      },
+      theme: theme,
+      style: {
+        display: collapsed ? 'block' : 'none'
+      }
+    }), _jsx(FoldMenu, {
+      dataSource: {
+        menus: menus,
+        iconfontUrl: iconfontUrl,
+        height: headerHeight + (notice ? 32 : 0) + 48,
+        notice: notice,
+        collapsed: collapsed,
+        headerHeight: headerHeight
+      },
+      style: {
+        display: collapsed ? 'none' : 'block',
+        height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0) + 48 || 0, "px)")
+      }
+    }), _jsx("div", {
+      className: "pro-layout-menu-collapsed",
+      onClick: onToggle,
+      children: _jsx("div", {
+        className: "pro-layout-arrow "
+      })
+    })]
+  });
 };
 export default Menu;

package/es/ProLayout/components/Layout/Menu/style/index.less

@@ -6,6 +6,25 @@
 .pro-layout-row {
   flex-direction: column;
 
+
+  .pro-layout-menu-open {
+    .pro-layout-arrow  {
+      transform: rotate(225deg);
+    }
+  }
+
+  .pro-layout-arrow {
+    width           : 10px;
+    height          : 10px;
+    background-color: transparent;
+    /* 模块背景为透明 */
+    border-color    : #fff;
+    border-style    : solid;
+    border-width    : 2px 2px 0 0;
+    margin-left     : -5px;
+    transform       : rotate(45deg);
+  }
+
   &.pro-layout-menu-no-collapsed {
     .pro-layout-menu-fold-li {
       display        : flex;
@@ -63,7 +82,7 @@
     position        : fixed;
     top             : 48px;
     left            : 0;
-    z-index         : 3;
+    z-index         : 1;
     width           : 48px;
     height          : 100vh;
     min-height      : 100%;
@@ -105,7 +124,7 @@
     position       : fixed;
     bottom         : 0;
     left           : 0;
-    z-index        : 10;
+    z-index        : 2;
     display        : flex;
     align-items    : center;
     justify-content: center;
@@ -128,4 +147,4 @@
   .pro-layout-menu-open~.pro-layout-content {
     margin-left: 220px !important
   }
-}
+}

package/es/ProLayout/components/Layout/Notice/index.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import tipMsg from '../../../images/tipMsg.png';
 import close from '../../../images/close.png';
 var Notice = function Notice(props) {
@@ -8,20 +8,22 @@ var Notice = function Notice(props) {
   if (!notice) {
     return null;
   }
-  return /*#__PURE__*/React.createElement("div", {
+  return _jsxs("div", {
     className: "pro-layout-header-notice",
     style: {
       top: headerHeight
-    }
-  }, /*#__PURE__*/React.createElement("img", {
-    src: tipMsg,
-    alt: "\u63D0\u793A"
-  }), " ", notice, /*#__PURE__*/React.createElement("span", {
-    className: "pro-layout-header-notice-close",
-    onClick: onCancel
-  }, /*#__PURE__*/React.createElement("img", {
-    src: close,
-    alt: "\u5173\u95ED"
-  })));
+    },
+    children: [_jsx("img", {
+      src: tipMsg,
+      alt: "\u63D0\u793A"
+    }), " ", notice, _jsx("span", {
+      className: "pro-layout-header-notice-close",
+      onClick: onCancel,
+      children: _jsx("img", {
+        src: close,
+        alt: "\u5173\u95ED"
+      })
+    })]
+  });
 };
 export default Notice;

package/es/ProLayout/components/Layout/Notice/style/index.less

@@ -16,14 +16,14 @@
 
     img {
       width       : 16px;
-      margin-right: 8px;
+      margin-right: var(--zaui-space-size-sm, 8px);
     }
 
     .pro-layout-header-notice-close {
       position: absolute;
       right   : 0;
       display : block;
-      padding : 0 17px;
+      padding : 0 var(--zaui-space-size-md, 16px);
       cursor  : pointer;
 
       img {
@@ -31,4 +31,4 @@
         margin-right: 0;
       }
     }
-  }
+  }

package/es/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -1,5 +1,5 @@
 import React, { CSSProperties } from 'react';
-import { CollapseProps, CollapsePanelProps } from 'antd/lib/collapse';
+import { CollapseProps, CollapsePanelProps } from 'antd/es/collapse';
 export type levelType = '1' | '2';
 export interface TitleListProps {
     /**

package/es/ProLayout/components/ProCollapse/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ProCollapseProps } from './PropTypes';
-declare const ProCollapse: (props: ProCollapseProps) => React.JSX.Element;
+declare const ProCollapse: (props: ProCollapseProps) => JSX.Element;
 export default ProCollapse;

package/es/ProLayout/components/ProCollapse/index.js

@@ -1,9 +1,10 @@
 import "antd/es/descriptions/style";
 import _Descriptions from "antd/es/descriptions";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/collapse/style";
 import _Collapse from "antd/es/collapse";
-import React from 'react';
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { CaretRightOutlined } from '@ant-design/icons';
 import classNames from 'classnames';
 var Panel = _Collapse.Panel;
@@ -25,16 +26,19 @@ var ProCollapse = function ProCollapse(props) {
     _props$folding = props.folding,
     folding = _props$folding === void 0 ? false : _props$folding,
     collapseProps = props.collapseProps,
-    collapsePanelProps = props.collapsePanelProps;
-  var cls = classNames({
+    collapsePanelProps = props.collapsePanelProps,
+    className = props.className;
+  var cls = classNames(_defineProperty({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
-    'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length
-  });
-  var content = /*#__PURE__*/React.createElement("div", {
+    'pro-collapse-list': titleList === null || titleList === void 0 ? void 0 : titleList.length,
+    'pro-collapse-no-title': !title
+  }, "".concat(className), className));
+  var content = _jsx("div", {
     className: "pro-collapse-content",
-    style: contentStyle
-  }, children);
+    style: contentStyle,
+    children: children
+  });
   var renderPanel = function renderPanel() {
     if (level === '2') {
       var level2Panel = classNames({
@@ -45,51 +49,61 @@ var ProCollapse = function ProCollapse(props) {
       if (!towCollapse) {
         hasCollapse.collapsible = 'disabled';
       }
-      return /*#__PURE__*/React.createElement(Panel, _objectSpread(_objectSpread({
+      return _jsx(Panel, _objectSpread(_objectSpread(_objectSpread({
         header: title,
-        key: "1",
         className: level2Panel,
-        extra: /*#__PURE__*/React.createElement("div", {
-          className: "extra-info"
-        }, extra),
+        extra: _jsx("div", {
+          className: "extra-info",
+          children: extra
+        }),
         forceRender: true
-      }, hasCollapse), collapsePanelProps), content);
+      }, hasCollapse), collapsePanelProps), {}, {
+        children: content
+      }), "1");
     }
-    return /*#__PURE__*/React.createElement(Panel, _objectSpread({
+    return _jsx(Panel, _objectSpread(_objectSpread({
       header: title,
-      key: "1",
       className: "pro-collapse-panel",
-      extra: /*#__PURE__*/React.createElement("div", {
-        className: "extra-info"
-      }, extra),
+      extra: _jsx("div", {
+        className: "extra-info",
+        children: extra
+      }),
       forceRender: true
-    }, collapsePanelProps), content);
+    }, collapsePanelProps), {}, {
+      children: content
+    }), "1");
   };
   var renderTitleList = function renderTitleList() {
-    return /*#__PURE__*/React.createElement("div", {
-      className: cls
-    }, /*#__PURE__*/React.createElement(_Descriptions, {
-      column: column
-    }, titleList === null || titleList === void 0 ? void 0 : titleList.map(function (item) {
-      return /*#__PURE__*/React.createElement(_Descriptions.Item, {
-        label: item.label
-      }, item.value || '-');
-    })), content);
+    return _jsxs("div", {
+      className: cls,
+      children: [_jsx(_Descriptions, {
+        column: column,
+        children: titleList === null || titleList === void 0 ? void 0 : titleList.map(function (item) {
+          return _jsx(_Descriptions.Item, {
+            label: item.label,
+            children: item.value || '-'
+          }, item.label);
+        })
+      }), content]
+    });
   };
-  return /*#__PURE__*/React.createElement("div", {
+  return _jsx("div", {
     id: id,
-    style: style
-  }, Array.isArray(titleList) && titleList.length ? renderTitleList() : /*#__PURE__*/React.createElement(_Collapse, _objectSpread({
-    className: cls,
-    bordered: false,
-    expandIcon: function expandIcon(_ref) {
-      var isActive = _ref.isActive;
-      return /*#__PURE__*/React.createElement(CaretRightOutlined, {
-        rotate: isActive ? -90 : 90
-      });
-    },
-    expandIconPosition: "end",
-    defaultActiveKey: folding ? [] : ['1']
-  }, collapseProps), renderPanel()));
+    style: style,
+    children: Array.isArray(titleList) && titleList.length ? renderTitleList() : _jsx(_Collapse, _objectSpread(_objectSpread({
+      className: cls,
+      bordered: false,
+      expandIcon: function expandIcon(_ref) {
+        var isActive = _ref.isActive;
+        return _jsx(CaretRightOutlined, {
+          rotate: isActive ? -90 : 90
+        });
+      },
+      expandIconPosition: "end",
+      defaultActiveKey: folding ? [] : ['1']
+    }, collapseProps), {}, {
+      children: renderPanel()
+    }))
+  });
 };
 export default ProCollapse;

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -1,6 +1,12 @@
 .pro-collapse {
   background: #f6f8fc;
 
+  &.pro-collapse-no-title {
+    .ant-collapse-header {
+      display: none !important;
+    }
+  }
+
   &.ant-collapse {
     .pro-collapse-panel {
       margin-bottom: var(--zaui-space-size-md, 16px);
@@ -67,7 +73,7 @@
 
       .ant-collapse-extra {
         .extra-info {
-          margin-right: 8px;
+          margin-right: var(--zaui-space-size-sm, 8px);
         }
       }
     }
@@ -75,7 +81,7 @@
     .pro-collapse-level2-collapse {
       .ant-collapse-extra {
         .extra-info {
-          margin-right: 32px;
+          margin-right: var(--zaui-space-size-lg, 32px);
         }
       }
     }
@@ -111,7 +117,7 @@
 
     .ant-descriptions-row>th,
     .ant-descriptions-row>td {
-      padding   : 15px 0;
+      padding   : var(--zaui-space-size-md, 16px) 0;
       background: #fafafa;
 
       &.ant-descriptions-item {
@@ -151,4 +157,4 @@
       margin-bottom: var(--zaui-space-size-md, 16px);
     }
   }
-}
+}

package/es/ProLayout/components/ProFooter/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { ProFooterProps } from './PropTypes';
-declare const _default: React.MemoExoticComponent<(props: ProFooterProps) => React.JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => JSX.Element>;
 export default _default;

package/es/ProLayout/components/ProFooter/index.js

@@ -2,16 +2,17 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useSize } from 'ahooks';
 import classnames from 'classnames';
-import React, { memo, useEffect } from 'react';
+import { memo, useEffect } from 'react';
 var ProFooter = function ProFooter(props) {
   var _props$visible = props.visible,
     visible = _props$visible === void 0 ? true : _props$visible,
     className = props.className,
     children = props.children,
     _props$zIndex = props.zIndex,
-    zIndex = _props$zIndex === void 0 ? 100 : _props$zIndex,
+    zIndex = _props$zIndex === void 0 ? 101 : _props$zIndex,
     _props$sideDom = props.sideDom,
     sideDom = _props$sideDom === void 0 ? '.pro-layout-sider-nav' : _props$sideDom,
     _props$contentDom = props.contentDom,
@@ -26,7 +27,7 @@ var ProFooter = function ProFooter(props) {
     }
     return function () {
       if (boxDom) {
-        boxDom.style.paddingBottom = '16px';
+        boxDom.style.paddingBottom = '0px';
       }
     };
   }, [boxDom]);
@@ -36,12 +37,15 @@ var ProFooter = function ProFooter(props) {
   var cls = classnames(_defineProperty({
     'pro-footer': true
   }, "".concat(className), className));
-  return /*#__PURE__*/React.createElement("div", {
+  return _jsx("div", {
     className: cls,
     style: _objectSpread({
       zIndex: zIndex,
       width: "calc(100% - ".concat(size === null || size === void 0 ? void 0 : size.width, "px)")
-    }, props.style)
-  }, /*#__PURE__*/React.createElement(_Space, null, children));
+    }, props.style),
+    children: _jsx(_Space, {
+      children: children
+    })
+  });
 };
 export default /*#__PURE__*/memo(ProFooter);

package/es/ProLayout/components/ProFooter/style/index.less

@@ -6,5 +6,5 @@
   padding   : var(--zaui-space-size-md, 16px) var(--zaui-space-size-lg, 32px);
   background: var(--zaui-base-bg, #ffffff);
   box-shadow: 3px 2px 12px 0 hsla(0, 0%, 59.2%, .32);
-  z-index   : 999;
-}
+  z-index   : 101;
+}

package/es/ProLayout/components/ProHeader/PropTypes.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { ModalProps } from 'antd';
 export type BreadcrumbType = 'breadcrumb' | 'copy' | 'info' | 'version' | 'tag';
 export type NavType = 'money' | 'thousandth' | 'enumName' | 'enumCodeName' | 'date' | 'dateTime';
 export interface BreadcrumbColumnsProps {
@@ -7,7 +8,7 @@ export interface BreadcrumbColumnsProps {
     value: any;
     width?: string | number;
     show?: boolean;
-    tag?: string | React.ReactNode;
+    tag?: string | React.ReactNode | (string | React.ReactNode)[];
 }
 export interface SubDescribeColumnsProps {
     label: string | React.ReactNode;
@@ -19,12 +20,12 @@ export interface SubDescribeColumnsProps {
     code?: string;
 }
 export interface DescribeColumnsProps {
-    label: string | React.ReactNode;
+    label?: string | React.ReactNode;
     copyable?: boolean;
-    value: string | React.ReactNode;
+    value?: string | React.ReactNode;
     show?: boolean;
     link?: string;
-    tag?: string | React.ReactNode;
+    tag?: string | React.ReactNode | (string | React.ReactNode)[];
 }
 export interface ProHeaderProps {
     title?: string | React.ReactNode;
@@ -58,14 +59,36 @@ export interface ProHeaderProps {
     */
     subDescribeColumns?: SubDescribeColumnsProps[];
     /**
-   * @description      次级描述是否展开
-   * @default           -
-   */
+    * @description      次级描述是否展开
+    * @default           -
+    */
     collapsed?: boolean;
+    /**
+    * @description      固定悬浮顶部距离
+    * @default           -
+    */
     fixedTop?: string | number;
+    /**
+    * @description      是否显示返回按钮
+    * @default           -
+    */
     showBack?: boolean;
     showShadow?: boolean;
+    /**
+    * @description      自动返回
+    * @default           2
+    */
     autoBack?: number;
+    /**
+    * @description      是否开启返回提示
+    * @default           false
+    */
+    isConfirmBack?: boolean;
+    /**
+    * @description      返回时二次确认弹框的属性
+    * @default           -
+    */
+    isConfirmBackModalProps?: ModalProps;
     zIndex?: number;
     onBack?: () => void;
     [key: string]: any;

package/es/ProLayout/components/ProHeader/components/Copy/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 declare const Copy: ({ text }: {
     text: any;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default Copy;

package/es/ProLayout/components/ProHeader/components/Copy/index.js

@@ -1,23 +1,20 @@
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
-import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { ReactSVG } from 'react-svg';
 import { CheckOutlined } from '@ant-design/icons';
 import copySvg from '../../../../../assets/copy.svg';
 var Paragraph = _Typography.Paragraph;
 var Copy = function Copy(_ref) {
   var text = _ref.text;
-  return /*#__PURE__*/React.createElement(Paragraph, {
+  return _jsx(Paragraph, {
     className: "pro-header-copy",
     copyable: {
       text: text,
-      icon: [/*#__PURE__*/React.createElement(ReactSVG, {
-        key: "copy-icon",
+      icon: [_jsx(ReactSVG, {
         className: "drag-icon",
         src: copySvg
-      }), /*#__PURE__*/React.createElement(CheckOutlined, {
-        key: "copied-icon"
-      })],
+      }, "copy-icon"), _jsx(CheckOutlined, {}, "copied-icon")],
       tooltips: ['复制', '复制成功']
     }
   });

package/es/ProLayout/components/ProHeader/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { ProHeaderProps } from './PropTypes';
-declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => JSX.Element>;
 export default _default;