@zat-design/sisyphus-react 3.13.17 → 3.13.18-beta.10

package/lib/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -80,17 +80,21 @@ interface ProModalPropsType {
     beforeOpen?: any;
     /** 打开弹框后的回调函数 */
     afterOpen?: any;
-    /** 是否启用tooltip提示 */
+    /** 废弃 是否启用tooltip提示 */
     isTooltip?: boolean;
+    /** 是否启用tooltip提示 */
+    tooltip?: boolean;
     /** 是否以"值-名称"形式展示 */
     showCodeName?: boolean;
     /** 查询表单实例，用于获取查询表单数据 */
     searchForm?: FormInstance;
     /** 模糊查询的字段名 */
     searchKey?: string;
+    /** 展示形式 */
+    mode?: 'input' | 'select';
 }
 /** 模态框选择器属性类型（结合Select和Input属性） */
-export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
+export declare type ProModalSelectPropsType = Omit<SelectProps & InputProps, 'mode'> & ProModalPropsType;
 /** 配置选项类型 */
 export type ProModalSelectConfigType = ConfigOption;
 /** 模态框属性类型 */
@@ -98,5 +102,5 @@ export type ProModalType = Omit<ProModalPropsType, 'configOption'> & {
     configOption: ProModalSelectConfigType;
 };
 /** 模态框选择器类型（结合Select和Input属性） */
-export type ProModalSelectType = SelectProps & InputProps & ProModalType;
+export type ProModalSelectType = Omit<SelectProps & InputProps, 'mode'> & ProModalType;
 export {};

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

@@ -53,7 +53,7 @@
     }
   }
 
-  // 新加适用于 readonly false
+  // 新加适用于 _readOnly false
   .@{ant-prefix}-input-affix-wrapper {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
@@ -100,7 +100,7 @@
   }
 
   .@{ant-prefix}-input-affix-wrapper-status-error{
-    
+
   }
 
 

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

@@ -20,7 +20,8 @@ var _index2 = require("../../../../index");
 var _utils = require("../../../../utils");
 var FoldMenu = function FoldMenu(props) {
   var style = props.style,
-    dataSource = props.dataSource;
+    dataSource = props.dataSource,
+    onMenuClick = props.onMenuClick;
   var menus = dataSource.menus,
     iconfontUrl = dataSource.iconfontUrl,
     notice = dataSource.notice,
@@ -89,7 +90,8 @@ var FoldMenu = function FoldMenu(props) {
           content: (0, _jsxRuntime.jsx)(_SideMenu.default, {
             dataSource: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, dataSource), {}, {
               menus: item
-            })
+            }),
+            onMenuClick: onMenuClick
           }),
           color: "#fff",
           overlayClassName: noticeCls,
@@ -98,12 +100,42 @@ var FoldMenu = function FoldMenu(props) {
             height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0), "px)")
           },
           placement: "rightTop",
-          children: LiNode
+          children: (0, _jsxRuntime.jsx)("span", {
+            onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+              var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+                return String(id);
+              }) : [String(id)];
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
+            },
+            children: LiNode
+          })
         }, "".concat(id, "-").concat(name)) : !collapsed ? (0, _jsxRuntime.jsx)(_tooltip.default, {
           placement: "right",
           title: name,
           children: (0, _jsxRuntime.jsx)("span", {
             onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+              var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+                return String(id);
+              }) : [String(id)];
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
               onSelected({
                 selectedPath: toPath
               });
@@ -113,10 +145,27 @@ var FoldMenu = function FoldMenu(props) {
               children: LiNode
             }, toPath)
           })
-        }, toPath) : (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
-          to: toPath,
-          children: LiNode
-        }, toPath);
+        }, toPath) : (0, _jsxRuntime.jsx)("span", {
+          onClick: function onClick() {
+            // 查找完整的菜单项数据
+            var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
+            var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+              return String(id);
+            }) : [String(id)];
+            // 调用用户传入的onMenuClick回调
+            if (onMenuClick) {
+              onMenuClick({
+                item: menuItem,
+                key: String(id),
+                keyPath: menuKeyPath
+              });
+            }
+          },
+          children: (0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+            to: toPath,
+            children: LiNode
+          }, toPath)
+        });
       })
     })
   });

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

@@ -25,7 +25,8 @@ var OpenMenu = function OpenMenu(props) {
     dataSource = props.dataSource,
     style = props.style,
     _props$theme = props.theme,
-    theme = _props$theme === void 0 ? 'dark' : _props$theme;
+    theme = _props$theme === void 0 ? 'dark' : _props$theme,
+    onMenuClick = props.onMenuClick;
   var _ref = dataSource || {},
     menus = _ref.menus,
     sideMenu = _ref.sideMenu;
@@ -149,7 +150,26 @@ var OpenMenu = function OpenMenu(props) {
       onClick: function onClick(_ref2) {
         var _item$props, _item$props2;
         var item = _ref2.item,
-          keyPath = _ref2.keyPath;
+          keyPath = _ref2.keyPath,
+          key = _ref2.key,
+          domEvent = _ref2.domEvent;
+        // console.log('item', item);
+        // console.log('keyPath', keyPath);
+        // console.log('key', key);
+        // console.log('domEvent', domEvent);
+        // 查找完整的菜单项数据
+        var menuItem = (0, _utils.findMenuItemByKey)(menus, key);
+        var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+          return String(id);
+        }) : keyPath;
+        // 调用用户传入的onMenuClick回调
+        if (onMenuClick) {
+          onMenuClick({
+            item: menuItem,
+            key: key,
+            keyPath: menuKeyPath
+          });
+        }
         setState({
           selectedKeys: keyPath,
           router: item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.router

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

@@ -11,7 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _ahooks = require("ahooks");
 var _OpenMenu = _interopRequireDefault(require("../OpenMenu"));
 var SideMenu = function SideMenu(props) {
-  var dataSource = props.dataSource;
+  var dataSource = props.dataSource,
+    onMenuClick = props.onMenuClick;
   var ref = (0, _react.useRef)(null);
   var size = (0, _ahooks.useSize)(ref);
   var menus = dataSource.menus,
@@ -31,6 +32,7 @@ var SideMenu = function SideMenu(props) {
       children: (0, _jsxRuntime.jsx)(_OpenMenu.default, {
         className: "pro-layout-sider-menu-list",
         theme: "light",
+        onMenuClick: onMenuClick,
         dataSource: {
           menus: (menus === null || menus === void 0 ? void 0 : menus.children) || [],
           iconfontUrl: iconfontUrl,

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

@@ -21,7 +21,8 @@ var Menu = function Menu(props) {
     pure = _ref.pure,
     theme = _ref.theme,
     sideMenuFooterRender = _ref.sideMenuFooterRender,
-    sideMenuHeaderRender = _ref.sideMenuHeaderRender;
+    sideMenuHeaderRender = _ref.sideMenuHeaderRender,
+    onMenuClick = _ref.onMenuClick;
   var menus = [];
   var menuCls = (0, _classnames.default)({
     'pro-layout-menu': true,
@@ -47,6 +48,7 @@ var Menu = function Menu(props) {
         height: headerHeight + (notice ? 32 : 0) + 48
       },
       theme: theme,
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'block' : 'none'
       }
@@ -59,6 +61,7 @@ var Menu = function Menu(props) {
         collapsed: collapsed,
         headerHeight: headerHeight
       },
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'none' : 'block',
         height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0) + 48 || 0, "px)")

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

@@ -99,7 +99,7 @@
     }
 
     .pro-collapse-content {
-      padding: var(--zaui-space-size-sm, 8px) 0 !important;
+      padding: var(--zaui-space-size-md, 16px) !important;
     }
 
     .pro-collapse-level2-collapse {
@@ -150,6 +150,9 @@
       .@{ant-prefix}-collapse-expand-icon {
         display: none;
       }
+      .pro-collapse-content{
+        padding: var(--zaui-space-size-sm, 8px) 0 !important;
+      }
     }
   }
 
@@ -204,6 +207,40 @@
 
   &.pro-collapse-level3 {
     margin-bottom: var(--zaui-space-size-md, 16px);
+
+    .pro-collapse-level2{
+      margin-top: 8px !important;
+      .pro-collapse-panel {
+        border: none !important;
+      }
+      .@{ant-prefix}-collapse-header {
+        height: auto !important;
+        background: #fff !important;
+        &:hover{
+          background: #fff !important;
+        }
+        .@{ant-prefix}-collapse-header-text {
+          &:before{
+            display: block;
+          }
+        }
+  
+        .@{ant-prefix}-collapse-extra {
+          .extra-info {
+            font-size: var(--zaui-font-size, 14px);
+            color: var(--zaui-text, #343434);
+          }
+        }
+      }
+      .@{ant-prefix}-collapse-content{
+        .@{ant-prefix}-collapse-content-box{
+          .pro-collapse-content{
+            padding: var(--zaui-space-size-sm, 8px) 0 !important;
+          }
+        }
+      }
+     
+    }
    
     .@{ant-prefix}-collapse-item-active{
       margin-bottom: 0 !important;
@@ -220,6 +257,12 @@
       }
     }
 
+    .pro-collapse-level3-no-collapse{
+      .@{ant-prefix}-collapse-header{
+        padding: 0 !important;
+      }
+    }
+
     .@{ant-prefix}-collapse-header {
       height: 48px !important;
       padding: 0 var(--zaui-space-size-md, 16px) !important;
@@ -269,7 +312,7 @@
         cursor: pointer;
         padding: 0 !important;
         &:hover {
-          background: #f0f0f0 !important;
+          background: #f0f0f0;
         }
       }
     }
@@ -296,10 +339,9 @@
       background: #F8F8F8 !important;
     }
   }
-      // 当pro-collapse-content包含level3但不包含level2时，添加padding
-    .pro-collapse-content:has(.pro-collapse-level3):not(:has(.pro-collapse-level2)) {
-      padding: var(--zaui-space-size-md, 16px) !important;
-      padding-right: 0 !important;
-    }
-    
+  // 当pro-collapse-content直接包含level3且不包含level2时，添加padding
+ .pro-collapse-level2 .pro-collapse-content:has(.pro-collapse-level3) {
+    padding: var(--zaui-space-size-md, 16px) !important;
+    padding-right: 0 !important;
+  } 
 }

package/lib/ProLayout/index.js

@@ -37,7 +37,8 @@ var ProLayout = function ProLayout(props) {
     pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
     theme = props.theme,
     target = props.target,
-    onCollapsedChange = props.onCollapsedChange;
+    onCollapsedChange = props.onCollapsedChange,
+    onMenuClick = props.onMenuClick;
   var _useSetState = (0, _ahooks.useSetState)({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -102,6 +103,7 @@ var ProLayout = function ProLayout(props) {
         } : menus,
         notice: notice,
         collapsed: collapsed,
+        onMenuClick: onMenuClick,
         onToggle: function onToggle() {
           toggle();
           onCollapsedChange && onCollapsedChange(!collapsed);

package/lib/ProLayout/propTypes.d.ts

@@ -180,6 +180,15 @@ export interface ProLayoutType {
      * @default -
      */
     onCollapsedChange?: (collapsed: boolean) => void;
+    /**
+     * @description 菜单点击回调事件，返回命中的菜单项数据和完整路径
+     * @default -
+     */
+    onMenuClick?: (params: {
+        item: MenusType | null;
+        key: string;
+        keyPath: string[];
+    }) => void;
     /**
      * @description 规定在何处打开被链接文档
      * @default "_self"

package/lib/ProLayout/utils/index.d.ts

@@ -34,3 +34,10 @@ export declare const getPathNameKey: ({ menus, pathName, }: {
     menus: any[];
     pathName: string;
 }) => any;
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+export declare const findMenuItemByKey: (menus: any[], key: string) => any;

package/lib/ProLayout/utils/index.js

@@ -4,9 +4,10 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPathNameKey = exports.getIdsByPathName = void 0;
+exports.getPathNameKey = exports.getIdsByPathName = exports.findMenuItemByKey = void 0;
 exports.getUrlParams = getUrlParams;
 exports.transformMenus = exports.transformMenu = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
@@ -168,4 +169,32 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
   };
   _menuDeep3(menus);
   return result;
+};
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+var _findMenuItemByKey = exports.findMenuItemByKey = function findMenuItemByKey(menus, key) {
+  // eslint-disable-next-line no-restricted-syntax
+  var _iterator = (0, _createForOfIteratorHelper2.default)(menus),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      if (String(item.id) === key) {
+        return item;
+      }
+      if (Array.isArray(item.children) && item.children.length) {
+        var found = _findMenuItemByKey(item.children, key);
+        if (found) return found;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.17",
+  "version": "3.13.18-beta.10",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

package/es/ProForm/components/base/DatePicker/useDateLimit.d.ts

@@ -1,9 +0,0 @@
-import { DurationInputArg1, DurationInputArg2, Moment } from 'moment';
-interface Props {
-    range?: [Moment?, Moment?];
-    limit?: [DurationInputArg1, DurationInputArg2];
-}
-export declare const useDateLimit: (props: Props) => {
-    onCalendarChange: (val: any) => void;
-};
-export {};

package/es/ProForm/components/base/DatePicker/useDateLimit.js

@@ -1,15 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useState } from 'react';
-export var useDateLimit = function useDateLimit(props) {
-  var range = props.range,
-    limit = props.limit;
-  var _useState = useState(),
-    _useState2 = _slicedToArray(_useState, 2),
-    dates = _useState2[0],
-    setDates = _useState2[1];
-  return {
-    onCalendarChange: function onCalendarChange(val) {
-      return setDates(val);
-    }
-  };
-};

package/lib/ProForm/components/base/DatePicker/useDateLimit.d.ts

@@ -1,9 +0,0 @@
-import { DurationInputArg1, DurationInputArg2, Moment } from 'moment';
-interface Props {
-    range?: [Moment?, Moment?];
-    limit?: [DurationInputArg1, DurationInputArg2];
-}
-export declare const useDateLimit: (props: Props) => {
-    onCalendarChange: (val: any) => void;
-};
-export {};

package/lib/ProForm/components/base/DatePicker/useDateLimit.js

@@ -1,22 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useDateLimit = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = require("react");
-var useDateLimit = exports.useDateLimit = function useDateLimit(props) {
-  var range = props.range,
-    limit = props.limit;
-  var _useState = (0, _react.useState)(),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    dates = _useState2[0],
-    setDates = _useState2[1];
-  return {
-    onCalendarChange: function onCalendarChange(val) {
-      return setDates(val);
-    }
-  };
-};