@lemon-fe/components 0.0.2 → 0.0.3

package/es/MainFramework/components/Menu/index.js

@@ -70,7 +70,7 @@ export default function Menu(props) {
   var activeMenu = useMemo(function () {
     var check = function check(path) {
       if (path) {
-        return new RegExp("".concat(path, "\\b")).test(location.pathname);
+        return new RegExp("".concat(path, "(?![^\\/])")).test(location.pathname);
       }
 
       return false;
@@ -123,6 +123,8 @@ export default function Menu(props) {
           popup.current.classList.add('animated');
         }
       }, 16);
+    } else {
+      setPopover(null);
     }
   };
 
@@ -218,49 +220,61 @@ export default function Menu(props) {
 
   var renderDrawerItems = function renderDrawerItems() {
     var cols = [[], [], []];
-    menus.forEach(function (item, index) {
-      cols[index % 3].push(item);
-    });
-    return cols.map(function (items) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "".concat(prefixCls, "-menu-drawer-col")
-      }, items.map(function (item) {
-        var list = [/*#__PURE__*/React.createElement("div", {
-          className: "".concat(prefixCls, "-menu-drawer-1"),
-          key: item.name,
-          onClick: function onClick() {
-            return handleClick(item);
-          }
-        }, item.name)];
-
-        if (item.children) {
-          item.children.forEach(function (subItem) {
-            list.push( /*#__PURE__*/React.createElement("div", {
-              className: "".concat(prefixCls, "-menu-drawer-2"),
-              key: subItem.name,
-              onClick: function onClick() {
-                return handleClick(subItem);
-              }
-            }, subItem.name));
-
-            if (subItem.children) {
-              subItem.children.forEach(function (child) {
-                list.push( /*#__PURE__*/React.createElement("div", {
-                  className: classNames("".concat(prefixCls, "-menu-drawer-3"), _defineProperty({}, "".concat(prefixCls, "-menu-active"), activeMenu !== undefined && activeMenu.key === child.path)),
-                  key: child.name,
-                  onClick: function onClick() {
-                    return handleClick(child);
-                  }
-                }, child.name));
-              });
+    var value = [0, 0, 0];
+    menus.forEach(function (item) {
+      var list = [/*#__PURE__*/React.createElement("div", {
+        className: classNames("".concat(prefixCls, "-menu-drawer-1"), _defineProperty({}, "".concat(prefixCls, "-menu-drawer-1-path"), item.path !== undefined)),
+        key: item.name,
+        onClick: function onClick() {
+          return handleClick(item);
+        }
+      }, item.name)];
+
+      if (item.children) {
+        item.children.forEach(function (subItem) {
+          list.push( /*#__PURE__*/React.createElement("div", {
+            className: "".concat(prefixCls, "-menu-drawer-2"),
+            key: "2-".concat(subItem.name),
+            onClick: function onClick() {
+              return handleClick(subItem);
             }
-          });
+          }, subItem.name));
+
+          if (subItem.children) {
+            subItem.children.forEach(function (child) {
+              list.push( /*#__PURE__*/React.createElement("div", {
+                className: classNames("".concat(prefixCls, "-menu-drawer-3"), _defineProperty({}, "".concat(prefixCls, "-menu-active"), activeMenu !== undefined && activeMenu.key === child.path)),
+                key: "3-".concat(child.name),
+                onClick: function onClick() {
+                  return handleClick(child);
+                }
+              }, child.name));
+            });
+          }
+        });
+      }
+
+      var node = /*#__PURE__*/React.createElement("div", {
+        className: "".concat(prefixCls, "-menu-drawer-block")
+      }, /*#__PURE__*/React.createElement("div", null, list));
+      var target = 0;
+      var min = Infinity;
+
+      for (var i = 0; i < value.length; i++) {
+        if (value[i] < min) {
+          target = i;
+          min = value[i];
         }
+      }
 
-        return /*#__PURE__*/React.createElement("div", {
-          className: "".concat(prefixCls, "-menu-drawer-block")
-        }, /*#__PURE__*/React.createElement("div", null, list));
-      }));
+      value[target] += list.length;
+      cols[target].push(node);
+    });
+    return cols.map(function (items, index) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "".concat(prefixCls, "-menu-drawer-col"),
+        key: index
+      }, items);
     });
   };
 
@@ -316,11 +330,11 @@ export default function Menu(props) {
     strokeDasharray: "0,0",
     transform: "translate(-274.000000, -57.000000) translate(284.000000, 67.000000) scale(-1, 1) translate(-284.000000, -67.000000) translate(274.000000, 57.000000) translate(8.535522, 10.000000) rotate(-45.000000) translate(-8.535522, -10.000000)"
   })))))), menus.map(function (item, index) {
-    var _classNames4;
+    var _classNames5;
 
     return /*#__PURE__*/React.createElement("div", {
       key: index,
-      className: classNames("".concat(prefixCls, "-menu-top-item"), (_classNames4 = {}, _defineProperty(_classNames4, "".concat(prefixCls, "-menu-top-item-active"), activeMenu !== undefined && activeMenu.path[0] === index), _defineProperty(_classNames4, "".concat(prefixCls, "-menu-top-item-popover-active"), item === popover), _classNames4)),
+      className: classNames("".concat(prefixCls, "-menu-top-item"), (_classNames5 = {}, _defineProperty(_classNames5, "".concat(prefixCls, "-menu-top-item-active"), activeMenu !== undefined && activeMenu.path[0] === index), _defineProperty(_classNames5, "".concat(prefixCls, "-menu-top-item-popover-active"), item === popover), _classNames5)),
       onClick: function onClick() {
         return handleClick(item);
       },
@@ -333,7 +347,7 @@ export default function Menu(props) {
     }), /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefixCls, "-menu-title")
     }, item.name));
-  }), /*#__PURE__*/React.createElement("div", {
+  })), false && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-menu-gutter")
   }), collapsed ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-menu-top-item"),

package/es/MainFramework/components/Menu/index.less

@@ -6,6 +6,8 @@
   flex: 0 0 200px;
   min-width: 0;
   height: 100%;
+  padding: 16px 0;
+  white-space: nowrap;
   transition: flex 0.1s;
 
   &-collapsed {
@@ -17,8 +19,6 @@
     z-index: 3;
     box-sizing: border-box;
     width: 100%;
-    padding: 16px 0;
-    white-space: nowrap;
     background: #f2f2f2;
   }
 
@@ -278,14 +278,16 @@
     }
 
     &-body {
-      display: flex;
+      height: calc(100vh - 56px);
       padding: 16px;
       overflow-x: hidden;
       overflow-y: auto;
     }
 
     &-col {
+      display: inline-block;
       width: 33.33333333%;
+      vertical-align: top;
     }
 
     .item() {
@@ -299,6 +301,16 @@
       color: rgba(51, 51, 51, 1);
       font-weight: 500;
       .item();
+
+      &-path {
+        cursor: pointer;
+        .transition();
+
+        &:hover {
+          color: rgba(5, 96, 253, 1);
+          background-color: rgba(238, 238, 238, 1);
+        }
+      }
     }
 
     &-2 {
@@ -323,6 +335,7 @@
       padding: 8px;
 
       & > div {
+        overflow: hidden;
         background-color: rgba(238, 238, 238, 0.5);
         border-radius: 8px;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "> TODO: description",
   "author": "鲁盛杰 <lusj@cnlemon.net>",
   "homepage": "",
@@ -13,7 +13,7 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "dependencies": {
-    "@lemon-fe/hooks": "^0.0.2",
+    "@lemon-fe/hooks": "^0.0.3",
     "antd": "^4.17.0",
     "classnames": "^2.2.6",
     "lodash": "^4.17.21",
@@ -36,5 +36,5 @@
     "@types/lodash": "^4.14.179",
     "@types/react-resizable": "^1.7.4"
   },
-  "gitHead": "fb99301b92d7fce50677a82ba546bf4309b33413"
+  "gitHead": "4793be25184347a233655cd67038427b79767c46"
 }