@bit-sun/business-component 2.4.30 → 2.4.31-alpha.0

package/dist/components/Functional/AccessWrapper/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+declare const NoFoundPage: React.FC<{
+    closeCurrentTab?: () => void;
+}>;
+export default NoFoundPage;

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import cookie from 'js-cookie';
-import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Space, Dropdown, Button, Checkbox, Menu, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
+import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Space, Dropdown, Button, Checkbox, Menu, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Result, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
 import _, { omit, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import { formatMessage, history, useLocation, Link, useModel, useIntl } from 'umi';
 import isEqual from 'lodash/isEqual';
@@ -16489,6 +16489,27 @@ var CustomerMenuHeader = function CustomerMenuHeader(_ref) {
 var css_248z$m = ".customer_menu_content {\n  color: #b1bad4;\n  background: #141620;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 18px;\n  height: 40px;\n  border-bottom: 1px solid #3d4047;\n}\n.customer_menu_content .ant-btn-link {\n  color: #b1bad4 !important;\n  font-size: 16px;\n  height: 36px;\n}\n.menu_item {\n  line-height: 30px;\n  height: 30px;\n  color: rgba(44, 47, 46);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.link_style:hover {\n  background-color: #e4e7ed;\n  cursor: pointer;\n  color: #1890ff;\n}\n.sub_menu_content {\n  box-shadow: 2px 0px 4px 0px rgba(185, 185, 185, 0.5);\n  position: fixed;\n  top: 50px;\n  left: 140px;\n  width: 200px;\n  height: 100%;\n  background-color: #fff;\n  padding-top: 10px;\n  z-index: 9999;\n}\n.tab_left_operate {\n  display: flex;\n  height: 28px;\n  align-items: center;\n}\n.tab_left_operate > div {\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  cursor: pointer;\n}\n.tab_left_operate > div:last-child {\n  box-shadow: 2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n}\n.tab_right_operate {\n  height: 28px;\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  box-shadow: -2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n  cursor: pointer;\n  position: relative;\n}\n";
 styleInject(css_248z$m);
 
+/*
+ * @Date: 2022-04-01 15:42:51
+ * @LastEditors: 追随
+ * @LastEditTime: 2022-09-16 20:53:23
+ */
+var NoFoundPage = function NoFoundPage(props) {
+  return /*#__PURE__*/React$1.createElement("div", {
+    style: {
+      height: 'calc(100vh - 88px)',
+      background: '#fff',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React$1.createElement(Result, {
+    status: "404",
+    title: "404",
+    subTitle: /*#__PURE__*/React$1.createElement("div", null, /*#__PURE__*/React$1.createElement("div", null, "\u62B1\u6B49\uFF0C\u65E0\u6CD5\u8BBF\u95EE\u8BE5\u9875\u9762\uFF01"), /*#__PURE__*/React$1.createElement("div", null, "\u8BF7\u5173\u95ED\u5F53\u524D\u9875\u7B7E"))
+  }));
+};
+
 var _excluded$g = ["route"];
 var TabPane = Tabs.TabPane;
 var UN_LISTTEN_DRP;
@@ -16703,22 +16724,38 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
     _this.updateTree = function (Tree) {
       var treeData = Tree;
       var treeList = [];
+      var limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
+      var menuKeys = [];
+      var getLimitedMenuKeys = function getLimitedMenuKeys(data) {
+        data.forEach(function (item) {
+          if (item.children && item.children.length > 0) {
+            getLimitedMenuKeys(item.children);
+          } else {
+            menuKeys.push(item.path.replace(/^\/\w+\//, '/'));
+          }
+        });
+      };
+      getLimitedMenuKeys(limitedMenuData);
       // 递归获取树列表
       var getTreeList = function getTreeList(data) {
         data.forEach(function (node) {
           if (node.routes && node.routes.length > 0) {
             getTreeList(node.routes);
           } else {
-            treeList.push({
-              tab: node.locale,
-              key: node.path,
-              locale: node.locale,
-              closable: true,
-              content: node.component,
-              name: node.name,
-              hideInMenu: node.hideInMenu,
-              isOnlyOnePage: node.isOnlyOnePage
-            });
+            if (node.path === '/' || menuKeys.some(function (item) {
+              return (node.path || '').includes(item);
+            })) {
+              treeList.push({
+                tab: node.locale,
+                key: node.path,
+                locale: node.locale,
+                closable: true,
+                content: node.component,
+                name: node.name,
+                hideInMenu: node.hideInMenu,
+                isOnlyOnePage: node.isOnlyOnePage
+              });
+            }
           }
         });
       };
@@ -16775,7 +16812,6 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       return moment$1(timeStr).add(8, 'hours').format(format) || '- -';
     };
     _this.onChange = function (key) {
-      // console.log('onChange');
       if (key !== _this.state.activeKey) {
         _this.setState({
           activeKey: key
@@ -17185,20 +17221,15 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         }
         if (!listenRouterKey.includes(currentKey)) {
           if (!replaceRouter) {
-            var _routerArray$filter;
-            replaceRouter = (_routerArray$filter = routerArray.filter(function (itemroute) {
-              return itemroute.key === '/404';
-            })) === null || _routerArray$filter === void 0 ? void 0 : _routerArray$filter[0];
-            _this2.setState({
-              listenRouterState: [].concat(_toConsumableArray(listenRouterState), [_objectSpread2(_objectSpread2({}, replaceRouter), {}, {
-                key: currentKey,
-                tab: '404'
-              })]),
-              activeKey: currentKey,
-              listenRouterKey: [].concat(_toConsumableArray(listenRouterKey), [currentKey])
-            }, function () {
-              _this2.checkisNavSlide();
-            });
+            replaceRouter = {
+              content: currentKey,
+              key: currentKey,
+              name: '404',
+              tab: '404',
+              isNotFound: true
+            };
+            newListenRouterState = [].concat(_toConsumableArray(newListenRouterState), [_objectSpread2({}, replaceRouter)]);
+            newListenRouterKey = [].concat(_toConsumableArray(listenRouterKey), [currentKey]);
           } else {
             var match = matchPath(route.pathname, {
               path: replaceRouter.key
@@ -17716,8 +17747,7 @@ var WrapperComponent = /*#__PURE__*/function (_React$Component) {
         getDictionaryTextByValue = _this$props4.getDictionaryTextByValue,
         timeFormat = _this$props4.timeFormat,
         transparentProps = _this$props4.transparentProps;
-      console.log('child wrapper conpent', this.props);
-      return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement(item.content, _objectSpread2(_objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, item.isNotFound ? ( /*#__PURE__*/React$1.createElement(NoFoundPage, null)) : /*#__PURE__*/React$1.createElement(item.content, _objectSpread2(_objectSpread2(_objectSpread2({
         getDictionarySource: getDictionarySource,
         getDictionaryTextByValue: getDictionaryTextByValue,
         timeFormat: timeFormat

package/dist/index.js

@@ -16509,6 +16509,27 @@ var CustomerMenuHeader = function CustomerMenuHeader(_ref) {
 var css_248z$m = ".customer_menu_content {\n  color: #b1bad4;\n  background: #141620;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  font-size: 18px;\n  height: 40px;\n  border-bottom: 1px solid #3d4047;\n}\n.customer_menu_content .ant-btn-link {\n  color: #b1bad4 !important;\n  font-size: 16px;\n  height: 36px;\n}\n.menu_item {\n  line-height: 30px;\n  height: 30px;\n  color: rgba(44, 47, 46);\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n.link_style:hover {\n  background-color: #e4e7ed;\n  cursor: pointer;\n  color: #1890ff;\n}\n.sub_menu_content {\n  box-shadow: 2px 0px 4px 0px rgba(185, 185, 185, 0.5);\n  position: fixed;\n  top: 50px;\n  left: 140px;\n  width: 200px;\n  height: 100%;\n  background-color: #fff;\n  padding-top: 10px;\n  z-index: 9999;\n}\n.tab_left_operate {\n  display: flex;\n  height: 28px;\n  align-items: center;\n}\n.tab_left_operate > div {\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  height: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  cursor: pointer;\n}\n.tab_left_operate > div:last-child {\n  box-shadow: 2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n}\n.tab_right_operate {\n  height: 28px;\n  width: 28px;\n  font-size: 12px;\n  color: #2C2F2ECC;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  border-right: 1px solid #E4E4E4;\n  background-color: #fff;\n  box-shadow: -2px -2px 4px 0px rgba(185, 185, 185, 0.9);\n  z-index: 99;\n  cursor: pointer;\n  position: relative;\n}\n";
 styleInject(css_248z$m);
 
+/*
+ * @Date: 2022-04-01 15:42:51
+ * @LastEditors: 追随
+ * @LastEditTime: 2022-09-16 20:53:23
+ */
+var NoFoundPage = function NoFoundPage(props) {
+  return /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      height: 'calc(100vh - 88px)',
+      background: '#fff',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Result, {
+    status: "404",
+    title: "404",
+    subTitle: /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("div", null, "\u62B1\u6B49\uFF0C\u65E0\u6CD5\u8BBF\u95EE\u8BE5\u9875\u9762\uFF01"), /*#__PURE__*/React__default['default'].createElement("div", null, "\u8BF7\u5173\u95ED\u5F53\u524D\u9875\u7B7E"))
+  }));
+};
+
 var _excluded$g = ["route"];
 var TabPane = antd.Tabs.TabPane;
 var UN_LISTTEN_DRP;
@@ -16723,22 +16744,38 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
     _this.updateTree = function (Tree) {
       var treeData = Tree;
       var treeList = [];
+      var limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
+      var menuKeys = [];
+      var getLimitedMenuKeys = function getLimitedMenuKeys(data) {
+        data.forEach(function (item) {
+          if (item.children && item.children.length > 0) {
+            getLimitedMenuKeys(item.children);
+          } else {
+            menuKeys.push(item.path.replace(/^\/\w+\//, '/'));
+          }
+        });
+      };
+      getLimitedMenuKeys(limitedMenuData);
       // 递归获取树列表
       var getTreeList = function getTreeList(data) {
         data.forEach(function (node) {
           if (node.routes && node.routes.length > 0) {
             getTreeList(node.routes);
           } else {
-            treeList.push({
-              tab: node.locale,
-              key: node.path,
-              locale: node.locale,
-              closable: true,
-              content: node.component,
-              name: node.name,
-              hideInMenu: node.hideInMenu,
-              isOnlyOnePage: node.isOnlyOnePage
-            });
+            if (node.path === '/' || menuKeys.some(function (item) {
+              return (node.path || '').includes(item);
+            })) {
+              treeList.push({
+                tab: node.locale,
+                key: node.path,
+                locale: node.locale,
+                closable: true,
+                content: node.component,
+                name: node.name,
+                hideInMenu: node.hideInMenu,
+                isOnlyOnePage: node.isOnlyOnePage
+              });
+            }
           }
         });
       };
@@ -16795,7 +16832,6 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
       return moment__default['default'](timeStr).add(8, 'hours').format(format) || '- -';
     };
     _this.onChange = function (key) {
-      // console.log('onChange');
       if (key !== _this.state.activeKey) {
         _this.setState({
           activeKey: key
@@ -17205,20 +17241,15 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         }
         if (!listenRouterKey.includes(currentKey)) {
           if (!replaceRouter) {
-            var _routerArray$filter;
-            replaceRouter = (_routerArray$filter = routerArray.filter(function (itemroute) {
-              return itemroute.key === '/404';
-            })) === null || _routerArray$filter === void 0 ? void 0 : _routerArray$filter[0];
-            _this2.setState({
-              listenRouterState: [].concat(_toConsumableArray(listenRouterState), [_objectSpread2(_objectSpread2({}, replaceRouter), {}, {
-                key: currentKey,
-                tab: '404'
-              })]),
-              activeKey: currentKey,
-              listenRouterKey: [].concat(_toConsumableArray(listenRouterKey), [currentKey])
-            }, function () {
-              _this2.checkisNavSlide();
-            });
+            replaceRouter = {
+              content: currentKey,
+              key: currentKey,
+              name: '404',
+              tab: '404',
+              isNotFound: true
+            };
+            newListenRouterState = [].concat(_toConsumableArray(newListenRouterState), [_objectSpread2({}, replaceRouter)]);
+            newListenRouterKey = [].concat(_toConsumableArray(listenRouterKey), [currentKey]);
           } else {
             var match = matchPath(route.pathname, {
               path: replaceRouter.key
@@ -17736,8 +17767,7 @@ var WrapperComponent = /*#__PURE__*/function (_React$Component) {
         getDictionaryTextByValue = _this$props4.getDictionaryTextByValue,
         timeFormat = _this$props4.timeFormat,
         transparentProps = _this$props4.transparentProps;
-      console.log('child wrapper conpent', this.props);
-      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(item.content, _objectSpread2(_objectSpread2(_objectSpread2({
+      return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, item.isNotFound ? ( /*#__PURE__*/React__default['default'].createElement(NoFoundPage, null)) : /*#__PURE__*/React__default['default'].createElement(item.content, _objectSpread2(_objectSpread2(_objectSpread2({
         getDictionarySource: getDictionarySource,
         getDictionaryTextByValue: getDictionaryTextByValue,
         timeFormat: timeFormat

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.4.30",
+  "version": "2.4.31-alpha.0",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/BsLayouts/index.tsx

@@ -45,6 +45,8 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import ENUM from '@/utils/enumConfig';
 import { memoizeOneFormatter } from '@/utils/utils';
 import Item from 'antd/lib/list/Item';
+import { getLimitMenuDataKey } from '@/utils';
+import NoFoundPage from '@/components/Functional/AccessWrapper';
 
 const { TabPane } = Tabs;
 
@@ -420,24 +422,23 @@ class BasicLayout extends React.PureComponent {
       }
 
       if (!listenRouterKey.includes(currentKey)) {
+
         if (!replaceRouter) {
-          replaceRouter = routerArray.filter(
-            (itemroute) => itemroute.key === '/404',
-          )?.[0];
+          replaceRouter = {
+            content: currentKey,
+            key: currentKey,
+            name:'404',
+            tab: '404',
+            isNotFound: true,
+          }
 
-          this.setState(
+          newListenRouterState = [
+            ...newListenRouterState,
             {
-              listenRouterState: [
-                ...listenRouterState,
-                { ...replaceRouter, key: currentKey, tab: '404' },
-              ],
-              activeKey: currentKey,
-              listenRouterKey: [...listenRouterKey, currentKey],
-            },
-            () => {
-              this.checkisNavSlide();
+              ...replaceRouter,
             },
-          );
+          ];
+          newListenRouterKey = [...listenRouterKey, currentKey];
         } else {
           const match = matchPath(route.pathname, { path: replaceRouter.key }, pathToRegexp);
           newListenRouterState = [
@@ -543,22 +544,39 @@ class BasicLayout extends React.PureComponent {
   updateTree = (Tree) => {
     const treeData = Tree;
     const treeList = [];
+
+    const limitedMenuData = localStorage.getItem(getLimitMenuDataKey()) ? JSON.parse(localStorage.getItem(getLimitMenuDataKey())) : [];
+    
+    const menuKeys = [];
+    const getLimitedMenuKeys = (data) => {
+      data.forEach((item) => {
+        if (item.children && item.children.length > 0) {
+          getLimitedMenuKeys(item.children);
+        } else {
+          menuKeys.push(item.path.replace(/^\/\w+\//, '/'));
+        }
+      });
+    };
+    getLimitedMenuKeys(limitedMenuData);
+
     // 递归获取树列表
     const getTreeList = (data) => {
       data.forEach((node) => {
         if (node.routes && node.routes.length > 0) {
           getTreeList(node.routes);
         } else {
-          treeList.push({
-            tab: node.locale,
-            key: node.path,
-            locale: node.locale,
-            closable: true,
-            content: node.component,
-            name: node.name,
-            hideInMenu: node.hideInMenu,
-            isOnlyOnePage: node.isOnlyOnePage,
-          });
+          if (node.path === '/' || menuKeys.some(item => (node.path || '').includes(item))) {
+            treeList.push({
+              tab: node.locale,
+              key: node.path,
+              locale: node.locale,
+              closable: true,
+              content: node.component,
+              name: node.name,
+              hideInMenu: node.hideInMenu,
+              isOnlyOnePage: node.isOnlyOnePage,
+            });
+          }
         }
       });
     };
@@ -636,7 +654,6 @@ class BasicLayout extends React.PureComponent {
   };
 
   onChange = (key) => {
-    // console.log('onChange');
     if (key !== this.state.activeKey) {
       this.setState({
         activeKey: key,
@@ -1452,10 +1469,10 @@ class WrapperComponent extends React.Component {
       timeFormat,
       transparentProps,
     } = this.props;
-    console.log('child wrapper conpent', this.props)
     return (
       <>
-        {React.createElement(item.content, {
+        {item.isNotFound ? ( <NoFoundPage />) :
+         React.createElement(item.content, {
           getDictionarySource: getDictionarySource,
           getDictionaryTextByValue: getDictionaryTextByValue,
           timeFormat: timeFormat,

package/src/components/Functional/AccessWrapper/index.tsx

@@ -0,0 +1,34 @@
+/*
+ * @Date: 2022-04-01 15:42:51
+ * @LastEditors: 追随
+ * @LastEditTime: 2022-09-16 20:53:23
+ */
+import { Button, Result } from 'antd';
+import React from 'react';
+
+const NoFoundPage: React.FC<{
+  closeCurrentTab?: () => void;
+}> = (props) => (
+  <div
+    style={{
+      height: 'calc(100vh - 88px)',
+      background: '#fff',
+      display: 'flex',
+      justifyContent: 'center',
+      alignItems: 'center',
+    }}
+  >
+    <Result
+      status="404"
+      title="404"
+      subTitle={
+        <div>
+          <div>抱歉，无法访问该页面！</div>
+          <div>请关闭当前页签</div>
+        </div>
+      }
+    />
+  </div>
+);
+
+export default NoFoundPage;