@oceanbase/ui 0.2.32 → 0.2.33

package/es/BasicLayout/index.js

@@ -5,6 +5,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -19,7 +23,7 @@ import { Typography, theme } from '@oceanbase/design';
 import { isNullValue } from '@oceanbase/util';
 import { ConfigProvider, Divider, Layout, Menu, Tooltip } from '@oceanbase/design';
 import classNames from 'classnames';
-import { some } from 'lodash';
+import { some, uniq } from 'lodash';
 import { pathToRegexp } from 'path-to-regexp';
 import React, { useEffect, useState, useContext } from 'react';
 import LocaleWrapper from "../locale/LocaleWrapper";
@@ -90,7 +94,13 @@ var BasicLayout = function BasicLayout(_ref) {
       return item;
     });
     if (newSelectedKeys.length > 0) {
-      setSelectedKeys([newSelectedKeys[newSelectedKeys.length - 1]]);
+      // use last selected key to avoid multiple selected menus
+      var selectedKey = newSelectedKeys[newSelectedKeys.length - 1];
+      setSelectedKeys([selectedKey]);
+      // get parent keys of current selectedKey
+      var selectedParentKeys = getParentKeys(menus, selectedKey);
+      // append parent keys as open keys
+      setOpenKeys(uniq([].concat(_toConsumableArray(openKeys), _toConsumableArray(selectedParentKeys))));
     } else {
       setSelectedKeys([]);
     }
@@ -98,12 +108,11 @@ var BasicLayout = function BasicLayout(_ref) {
   var menuProps = {
     selectedKeys: selectedKeys,
     openKeys: openKeys,
-    onSelect: function (_ref2) {
+    onSelect: function onSelect(_ref2) {
       var newSelectedKeys = _ref2.selectedKeys;
       setSelectedKeys(newSelectedKeys);
     },
     onOpenChange: function onOpenChange(newOpenKeys) {
-      // 最多只允许一个子菜单展开
       setOpenKeys(newOpenKeys);
     }
   };
@@ -112,6 +121,21 @@ var BasicLayout = function BasicLayout(_ref) {
       return pathToRegexp(item).test(path);
     });
   };
+  var getParentKeys = function getParentKeys(menuList, selectedKey) {
+    var keys = [];
+    (menuList || []).forEach(function (item) {
+      var itemChildren = item.children || [];
+      var childrenKeys = itemChildren.map(function (child) {
+        return child.link;
+      });
+      if (childrenKeys.includes(selectedKey)) {
+        keys = [].concat(_toConsumableArray(keys), [item.link]);
+      } else {
+        keys = [].concat(_toConsumableArray(keys), [getParentKeys(itemChildren, selectedKey)]);
+      }
+    });
+    return keys;
+  };
   var getFlatMenuKeys = function getFlatMenuKeys(menuList) {
     var keys = [];
     (menuList || []).forEach(function (item) {

package/es/Highlight/index.d.ts

@@ -29,7 +29,7 @@ export declare const THEME_DARK = "dark";
 export declare const THEME_LIGHT = "light";
 declare const ThemeTypes: ["dark", "light"];
 export type ThemeType = (typeof ThemeTypes)[number];
-declare const supportedLanguages: ("ruby" | "css" | "bash" | "json" | "java" | "go" | "javascript" | "typescript" | "groovy" | "python" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "yaml" | "solidity" | "tsx" | "jsx")[];
+declare const supportedLanguages: ("ruby" | "css" | "java" | "json" | "bash" | "javascript" | "typescript" | "groovy" | "python" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "go" | "yaml" | "solidity" | "tsx" | "jsx")[];
 export type LanguageType = (typeof supportedLanguages)[number] | 'html';
 export interface HighlightProps extends LocaleWrapperProps {
     /**

package/lib/BasicLayout/index.js

@@ -80,7 +80,10 @@ var BasicLayout = ({
     const selectedMenuKeys = (0, import_util2.urlToList)(pathname).map((itemPath) => getMenuMatches(getFlatMenuKeys(menus), itemPath).pop()) || [];
     const newSelectedKeys = selectedMenuKeys.filter((item) => item);
     if (newSelectedKeys.length > 0) {
-      setSelectedKeys([newSelectedKeys[newSelectedKeys.length - 1]]);
+      const selectedKey = newSelectedKeys[newSelectedKeys.length - 1];
+      setSelectedKeys([selectedKey]);
+      const selectedParentKeys = getParentKeys(menus, selectedKey);
+      setOpenKeys((0, import_lodash.uniq)([...openKeys, ...selectedParentKeys]));
     } else {
       setSelectedKeys([]);
     }
@@ -100,6 +103,19 @@ var BasicLayout = ({
       return (0, import_path_to_regexp.pathToRegexp)(item).test(path);
     });
   };
+  const getParentKeys = (menuList, selectedKey) => {
+    let keys = [];
+    (menuList || []).forEach((item) => {
+      const itemChildren = item.children || [];
+      const childrenKeys = itemChildren.map((child) => child.link);
+      if (childrenKeys.includes(selectedKey)) {
+        keys = [...keys, item.link];
+      } else {
+        keys = [...keys, getParentKeys(itemChildren, selectedKey)];
+      }
+    });
+    return keys;
+  };
   const getFlatMenuKeys = (menuList) => {
     let keys = [];
     (menuList || []).forEach((item) => {

package/lib/Highlight/index.d.ts

@@ -29,7 +29,7 @@ export declare const THEME_DARK = "dark";
 export declare const THEME_LIGHT = "light";
 declare const ThemeTypes: ["dark", "light"];
 export type ThemeType = (typeof ThemeTypes)[number];
-declare const supportedLanguages: ("ruby" | "css" | "bash" | "json" | "java" | "go" | "javascript" | "typescript" | "groovy" | "python" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "yaml" | "solidity" | "tsx" | "jsx")[];
+declare const supportedLanguages: ("ruby" | "css" | "java" | "json" | "bash" | "javascript" | "typescript" | "groovy" | "python" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "go" | "yaml" | "solidity" | "tsx" | "jsx")[];
 export type LanguageType = (typeof supportedLanguages)[number] | 'html';
 export interface HighlightProps extends LocaleWrapperProps {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/ui",
-  "version": "0.2.32",
+  "version": "0.2.33",
   "description": "The UI library based on OceanBase Design",
   "keywords": [
     "oceanbase",
@@ -37,7 +37,7 @@
     "@ant-design/cssinjs": "^1.17.2",
     "@ant-design/pro-components": "^2.6.34",
     "@ant-design/pro-layout": "^7.17.15",
-    "@oceanbase/design": "^0.2.31",
+    "@oceanbase/design": "^0.2.32",
     "@oceanbase/icons": "^0.2.9",
     "@oceanbase/util": "^0.2.12",
     "ahooks": "^2.10.14",
@@ -65,5 +65,5 @@
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
-  "gitHead": "532d9294abcd03743224d6a9d59d4f1c9ab71375"
+  "gitHead": "61cbd02d7b906cd6fb2ee76531fe5da792ad672b"
 }