@blocklet/ui-react 2.4.48 → 2.4.49

package/lib/Dashboard/index.js

@@ -25,7 +25,7 @@ var _headerAddons2 = _interopRequireDefault(require("../common/header-addons"));
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["meta", "fallbackUrl", "invalidPathFallback", "headerAddons", "sessionManagerProps"];
+const _excluded = ["meta", "fallbackUrl", "invalidPathFallback", "headerAddons", "sessionManagerProps", "links"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -51,7 +51,8 @@ function Dashboard(_ref) {
     fallbackUrl,
     invalidPathFallback,
     headerAddons,
-    sessionManagerProps
+    sessionManagerProps,
+    links
   } = _ref,
       rest = _objectWithoutProperties(_ref, _excluded);
 
@@ -106,7 +107,8 @@ function Dashboard(_ref) {
       flattened,
       matchedIndex
     };
-  }, [formattedBlocklet, locale, userRole]); // 页面初始化时, 如果当前用户没有权限访问任何导航菜单 (比如登录时未提供 VC 导致无权限), 则跳转到 fallbackUrl
+  }, [formattedBlocklet, locale, userRole]);
+  const allLinks = typeof links === 'function' ? links(localizedNav) : [...localizedNav, ...links]; // 页面初始化时, 如果当前用户没有权限访问任何导航菜单 (比如登录时未提供 VC 导致无权限), 则跳转到 fallbackUrl
   // 未认证 (user 为空) 时不做处理, 这种情况的页面跳转逻辑一般由应用自行处理
 
   (0, _react.useLayoutEffect)(() => {
@@ -149,7 +151,7 @@ function Dashboard(_ref) {
     fullWidth: true,
     sidebarWidth: 128,
     legacy: false,
-    links: localizedNav
+    links: allLinks
   }, rest), {}, {
     headerProps: _objectSpread({
       homeLink: _blocklets.publicPath,
@@ -169,7 +171,8 @@ Dashboard.propTypes = {
   // 当前路径未匹配任何 nav links 时的 fallback, 默认行为跳转到首个可用的 nav link
   invalidPathFallback: _propTypes.default.func,
   headerAddons: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.node]),
-  sessionManagerProps: _types.sessionManagerProps
+  sessionManagerProps: _types.sessionManagerProps,
+  links: _propTypes.default.oneOfType([_propTypes.default.array, _propTypes.default.func])
 };
 Dashboard.defaultProps = {
   meta: {},
@@ -182,7 +185,8 @@ Dashboard.defaultProps = {
     onLogout: () => {
       window.location.href = _blocklets.publicPath;
     }
-  }
+  },
+  links: []
 };
 var _default = Dashboard;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.4.48",
+  "version": "2.4.49",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -30,8 +30,8 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.4.48",
-    "@arcblock/ux": "^2.4.48",
+    "@arcblock/did-connect": "^2.4.49",
+    "@arcblock/ux": "^2.4.49",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/iconify": "^2.2.1",
@@ -53,5 +53,5 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^28.1.3"
   },
-  "gitHead": "7ba461919bba281ba700a2388e4419676b647a01"
+  "gitHead": "81c74068803edad783cc931fc1de7a6ad6c85022"
 }

package/src/Dashboard/index.js

@@ -13,7 +13,7 @@ import HeaderAddons from '../common/header-addons';
  * 专门用于 (composable) blocklet 的 Dashboard 组件, 解析 blocklet meta 中 section 为 dashboard 的 navigation 数据, 渲染一个 UX Dashboard
  */
 // eslint-disable-next-line no-shadow
-function Dashboard({ meta, fallbackUrl, invalidPathFallback, headerAddons, sessionManagerProps, ...rest }) {
+function Dashboard({ meta, fallbackUrl, invalidPathFallback, headerAddons, sessionManagerProps, links, ...rest }) {
   const sessionCtx = useContext(SessionContext);
   const user = sessionCtx?.session?.user;
   const userRole = user?.role;
@@ -53,6 +53,8 @@ function Dashboard({ meta, fallbackUrl, invalidPathFallback, headerAddons, sessi
     return { localizedNav, flattened, matchedIndex };
   }, [formattedBlocklet, locale, userRole]);
 
+  const allLinks = typeof links === 'function' ? links(localizedNav) : [...localizedNav, ...links];
+
   // 页面初始化时, 如果当前用户没有权限访问任何导航菜单 (比如登录时未提供 VC 导致无权限), 则跳转到 fallbackUrl
   // 未认证 (user 为空) 时不做处理, 这种情况的页面跳转逻辑一般由应用自行处理
   useLayoutEffect(() => {
@@ -92,7 +94,7 @@ function Dashboard({ meta, fallbackUrl, invalidPathFallback, headerAddons, sessi
       fullWidth
       sidebarWidth={128}
       legacy={false}
-      links={localizedNav}
+      links={allLinks}
       {...rest}
       headerProps={{
         homeLink: publicPath,
@@ -112,6 +114,7 @@ Dashboard.propTypes = {
   invalidPathFallback: PropTypes.func,
   headerAddons: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
   sessionManagerProps,
+  links: PropTypes.oneOfType([PropTypes.array, PropTypes.func]),
 };
 
 Dashboard.defaultProps = {
@@ -126,6 +129,7 @@ Dashboard.defaultProps = {
       window.location.href = publicPath;
     },
   },
+  links: [],
 };
 
 export default Dashboard;