@lemon-fe/kits 1.2.13 → 1.2.14

package/es/hooks/use-batch-operator/index.js

@@ -692,7 +692,9 @@ var BatchOperate = /*#__PURE__*/function (_Component) {
                 results: results
               },
               columns: cols,
-              rowKey: rowKey
+              rowKey: rowKey,
+              localeText: this.props.locale.DataGrid.localeText,
+              locale: this.props.locale.DataGrid
             })
           })
         })

package/es/index.d.ts

@@ -4,8 +4,10 @@ export * from '@lemon-fe/utils';
 export { default as BasicLayout } from './layouts/basic-layout';
 export type { BasicLayoutLocale } from './layouts/basic-layout/locale/locale';
 export type { MicroLayoutLocale } from './layouts/micro-layout/locale/locale';
+export type { SimpleLayoutLocale } from './layouts/simple-layout/locale/locale';
 export { default as BlankLayout } from './layouts/blank-layout';
 export { default as MicroLayout } from './layouts/micro-layout';
+export { default as SimpleLayout } from './layouts/simple-layout';
 export { default as Breadcrumb } from './layouts/breadcrumb';
 export { default as useBatchOperator } from './hooks/use-batch-operator';
 export { default as useHistoryBlock } from './hooks/use-history-block';

package/es/index.js

@@ -4,6 +4,7 @@ export * from '@lemon-fe/utils';
 export { default as BasicLayout } from "./layouts/basic-layout";
 export { default as BlankLayout } from "./layouts/blank-layout";
 export { default as MicroLayout } from "./layouts/micro-layout";
+export { default as SimpleLayout } from "./layouts/simple-layout";
 export { default as Breadcrumb } from "./layouts/breadcrumb";
 export { default as useBatchOperator } from "./hooks/use-batch-operator";
 export { default as useHistoryBlock } from "./hooks/use-history-block";

package/es/layouts/index.d.ts

@@ -2,3 +2,4 @@ export { default as BasicLayout } from './basic-layout';
 export { default as BlankLayout } from './blank-layout';
 export { default as MicroLayout } from './micro-layout';
 export { default as Breadcrumb } from './breadcrumb';
+export { default as SimpleLayout } from './simple-layout';

package/es/layouts/index.js

@@ -1,4 +1,5 @@
 export { default as BasicLayout } from "./basic-layout";
 export { default as BlankLayout } from "./blank-layout";
 export { default as MicroLayout } from "./micro-layout";
-export { default as Breadcrumb } from "./breadcrumb";
+export { default as Breadcrumb } from "./breadcrumb";
+export { default as SimpleLayout } from "./simple-layout";

package/es/layouts/simple-layout/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { SimpleLayoutProps } from './typings';
+declare function SimpleLayout(props: SimpleLayoutProps): JSX.Element;
+declare const _default: React.MemoExoticComponent<typeof SimpleLayout>;
+export default _default;

package/es/layouts/simple-layout/index.js

@@ -0,0 +1,148 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { Button, Result } from 'antd';
+import React, { memo, useEffect } from 'react';
+import { useMemo } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
+import { matchPath, useHistory } from 'react-router-dom';
+import RouteTab from "../components/route-tab";
+import { useLastestRef } from '@lemon-fe/hooks';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+function isSubPath(path, subPath) {
+  var pathArr = path.split('/');
+  var subPathArr = subPath.split('/');
+  if (path.length > subPath.length) {
+    return false;
+  }
+  for (var i = 0; i < pathArr.length; i++) {
+    if (subPathArr[i] !== pathArr[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+function SimpleLayout(props) {
+  var _tabs$active;
+  var _props$routes = props.routes,
+    routes = _props$routes === void 0 ? [] : _props$routes,
+    authorities = props.authorities,
+    tabs = props.tabs,
+    active = props.active;
+  var history = useHistory();
+  var auth = useMemo(function () {
+    if (authorities === undefined || authorities === null) {
+      return authorities;
+    }
+    return new Set(authorities);
+  }, [authorities]);
+  var key = (_tabs$active = tabs[active]) === null || _tabs$active === void 0 ? void 0 : _tabs$active.rootPath;
+  var routeTabs = useMemo(function () {
+    return tabs.map(function (item) {
+      var tab = _objectSpread(_objectSpread({}, item), {}, {
+        route: null,
+        match: null
+      });
+      var findRoute = function findRoute(items) {
+        for (var i = 0; i < items.length; i++) {
+          var route = items[i];
+          var result = route.path ? matchPath(tab.location.pathname, {
+            path: route.path,
+            strict: route.strict,
+            sensitive: route.sensitive
+          }) : null;
+          if (result !== null) {
+            if (result.isExact || route.component && !route.exact) {
+              return {
+                route: route,
+                match: result
+              };
+            }
+            if (route.routes) {
+              var target = findRoute(route.routes);
+              if (target) {
+                return target;
+              }
+            }
+          }
+        }
+        return null;
+      };
+      var matched = findRoute(routes);
+      if (matched !== null) {
+        tab.match = matched.match;
+        tab.route = matched.route;
+      }
+      return tab;
+    });
+  }, [tabs, routes]);
+  var routeTabsRef = useLastestRef(routeTabs);
+  useEffect(function () {
+    history.block(function (loc, action) {
+      if (action === 'POP') {
+        return;
+      }
+      var pathname = loc.pathname;
+      var target = routeTabsRef.current.find(function (tab) {
+        return isSubPath(tab.rootPath, pathname);
+      });
+      if (target === undefined || loc.pathname === target.location.pathname) {
+        return;
+      }
+      if (target.instance !== undefined && target.instance.block({
+        title: target.title,
+        onOk: function onOk() {
+          history.push(loc);
+        }
+      })) {
+        return false;
+      }
+    });
+  }, []);
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: routeTabs.map(function (tab, index) {
+      var _tab$key;
+      var route = tab.route;
+      return /*#__PURE__*/_jsx("div", {
+        style: {
+          display: key !== tab.rootPath ? 'none' : undefined,
+          width: '100%',
+          height: '100%'
+        },
+        children: /*#__PURE__*/_jsx(ErrorBoundary, {
+          fallbackRender: function fallbackRender(_ref) {
+            var error = _ref.error,
+              resetErrorBoundary = _ref.resetErrorBoundary;
+            return /*#__PURE__*/_jsx(Result, {
+              status: "500",
+              title: "\u9875\u9762\u5F02\u5E38",
+              subTitle: error.message,
+              extra: /*#__PURE__*/_jsx(Button, {
+                type: "primary",
+                onClick: function onClick() {
+                  resetErrorBoundary();
+                },
+                children: "\u91CD\u65B0\u52A0\u8F7D"
+              })
+            });
+          },
+          children: route !== null && tab.match !== null && /*#__PURE__*/_jsx(RouteTab, {
+            authorities: auth,
+            routes: routes,
+            index: index,
+            history: history,
+            route: route,
+            location: tab.location,
+            match: tab.match,
+            instance: tab.instance
+          })
+        })
+      }, (_tab$key = tab.key) !== null && _tab$key !== void 0 ? _tab$key : tab.rootPath);
+    })
+  });
+}
+export default /*#__PURE__*/memo(SimpleLayout);

package/es/layouts/simple-layout/locale/en_US.d.ts

@@ -0,0 +1,3 @@
+import type { SimpleLayoutLocale } from './locale';
+declare const locale: SimpleLayoutLocale;
+export default locale;

package/es/layouts/simple-layout/locale/en_US.js

@@ -0,0 +1,5 @@
+var locale = {
+  pageExceptionText: 'Unexpected Situation',
+  reloadPageText: 'Reload'
+};
+export default locale;

package/es/layouts/simple-layout/locale/locale.d.ts

@@ -0,0 +1,4 @@
+export interface SimpleLayoutLocale {
+    pageExceptionText: string;
+    reloadPageText: string;
+}

package/es/layouts/simple-layout/locale/locale.js

@@ -0,0 +1 @@
+export {};

package/es/layouts/simple-layout/locale/zh_CN.d.ts

@@ -0,0 +1,3 @@
+import type { SimpleLayoutLocale } from './locale';
+declare const locale: SimpleLayoutLocale;
+export default locale;

package/es/layouts/simple-layout/locale/zh_CN.js

@@ -0,0 +1,5 @@
+var locale = {
+  pageExceptionText: '页面异常',
+  reloadPageText: '重新加载'
+};
+export default locale;

package/es/layouts/simple-layout/typings.d.ts

@@ -0,0 +1,28 @@
+import type { ReactText } from 'react';
+import type { TabInstance } from '../tab-instance';
+import type { IRoute, Location } from '../typings';
+
+export interface SimpleLayoutProps {
+  /**
+   * @description 路由配置
+   */
+  routes?: IRoute[];
+  /**
+   * @description 用户包含的所有权限
+   */
+  authorities?: ReactText[] | Set<ReactText> | null;
+  /**
+   * @description 主应用tabs
+   */
+  tabs: {
+    title: string;
+    rootPath: string;
+    location: Location;
+    instance?: TabInstance;
+    key?: string;
+  }[];
+  /**
+   * @description 当前active tab
+   */
+  active: number;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/kits",
-  "version": "1.2.13",
+  "version": "1.2.14",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@lemon-fe/components": "^1.2.13",
+    "@lemon-fe/components": "^1.2.14",
     "@lemon-fe/hooks": "^1.2.11",
     "@lemon-fe/utils": "^1.1.0",
     "antd": "4.24.8",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "4658fd8d24c995f46acbb63d6a9e0827d28e23cf"
+  "gitHead": "3ed306d1094065aa0788bb39e4db7d617eddea5b"
 }