@cloud-app-dev/vidc 2.0.0-alpha.13 → 2.0.0-alpha.14

package/es/AppRoute/index.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { IAppRouteProps } from './interface';
 declare class AppRoute extends React.PureComponent<IAppRouteProps, any> {
+    static defaultProps: IAppRouteProps;
     private isRender;
     constructor(props: IAppRouteProps);
     shouldComponentUpdate(props: IAppRouteProps): boolean;

package/es/AppRoute/index.js

@@ -1,7 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 import _cache from "@cloud-app-dev/utils/es/cache";
-import _useUnmount from "ahooks/es/useUnmount";
 import _useMount from "ahooks/es/useMount";
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -25,21 +24,16 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 import React from 'react';
-import { Route } from 'react-router-dom';
+import { Route, Routes } from 'react-router-dom';
 var _global = window;
 
 function RenderSingleRoute(_ref) {
-  var onMount = _ref.onMount,
-      onUnmount = _ref.onUnmount;
+  var onMount = _ref.onMount;
 
   _useMount(function () {
     return onMount();
   });
 
-  _useUnmount(function () {
-    return onUnmount();
-  });
-
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 
@@ -57,7 +51,7 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
 
     _this.isRender = false;
     _this.state = {
-      isMatch: false
+      mathIndex: -1
     };
     return _this;
   }
@@ -81,29 +75,22 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
     value: function render() {
       var _this2 = this;
 
-      var _this$props = this.props,
-          element = _this$props.element,
-          path = _this$props.path;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Route, {
-        path: path,
-        element: /*#__PURE__*/React.createElement(RenderSingleRoute, {
-          onMount: function onMount() {
-            return _this2.setState({
-              isMatch: true
-            });
-          },
-          onUnmount: function onUnmount() {
-            return _this2.setState({
-              isMatch: false
-            });
-          }
-        })
-      }), this.state.isMatch && element, /*#__PURE__*/React.createElement(RenderSingleRoute, {
+      var routes = this.props.routes;
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Routes, null, routes.map(function (item, index) {
+        return /*#__PURE__*/React.createElement(Route, {
+          path: item.path,
+          key: item.path,
+          element: /*#__PURE__*/React.createElement(RenderSingleRoute, {
+            onMount: function onMount() {
+              return _this2.setState({
+                mathIndex: index
+              });
+            }
+          })
+        });
+      })), this.state.matchIndex > -1 && routes[this.state.matchIndex].element, /*#__PURE__*/React.createElement(RenderSingleRoute, {
         onMount: function onMount() {
           return _this2.isRender = true;
-        },
-        onUnmount: function onUnmount() {
-          return _this2.isRender = false;
         }
       }));
     }
@@ -112,4 +99,7 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
   return AppRoute;
 }(React.PureComponent);
 
+AppRoute.defaultProps = {
+  routes: []
+};
 export default AppRoute;

package/es/AppRoute/interface.d.ts

@@ -1,7 +1,7 @@
 import * as H from 'history';
 import { RouteProps } from 'react-router-dom';
 
-export interface IAppRouteProps extends RouteProps, IAppRouteType {
+export interface IAppRouteProps {
   routes?: RouteProps[];
   tabId?: string;
   currentId?: string;

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.14",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",