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

package/es/AppRoute/index.d.ts

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

package/es/AppRoute/index.js

@@ -23,6 +23,7 @@ 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 { __rest } from "tslib";
 import React from 'react';
 import { Route, Routes } from 'react-router-dom';
 var _global = window;
@@ -37,8 +38,8 @@ function RenderSingleRoute(_ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 
-var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
-  _inherits(AppRoute, _React$PureComponent);
+var AppRoute = /*#__PURE__*/function (_React$Component) {
+  _inherits(AppRoute, _React$Component);
 
   var _super = _createSuper(AppRoute);
 
@@ -47,11 +48,9 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
 
     _classCallCheck(this, AppRoute);
 
-    _this = _super.call(this, props); //可能存在路由创建但是没有render 导致UI无法渲染
-
-    _this.isRender = false;
+    _this = _super.call(this, props);
     _this.state = {
-      mathIndex: -1
+      matchIndex: -1
     };
     return _this;
   }
@@ -59,11 +58,14 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
   _createClass(AppRoute, [{
     key: "shouldComponentUpdate",
     value: function shouldComponentUpdate(props) {
-      if (!_global._IS_RUN_MICRO_BASIC || !this.isRender || _global._IS_ALLOW_ROUTE_RENDER) {
-        return true;
+      var tabId = props.currentId || _cache.getCache('currentTabKey', 'session');
+
+      if (_global._IS_RUN_MICRO_BASIC && tabId !== props.tabId) {
+        // 页签变化拦截
+        return false;
       }
 
-      return (props.currentId || _cache.getCache('currentTabKey', 'session')) === props.tabId;
+      return true;
     }
   }, {
     key: "componentWillUnmount",
@@ -75,7 +77,14 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
     value: function render() {
       var _this2 = this;
 
-      var routes = this.props.routes;
+      var matchIndex = this.state.matchIndex;
+
+      var _a = this.props,
+          _a$routes = _a.routes,
+          routes = _a$routes === void 0 ? [] : _a$routes,
+          props = __rest(_a, ["routes"]);
+
+      var component = matchIndex > -1 ? routes[matchIndex].element : undefined;
       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,
@@ -83,21 +92,17 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
           element: /*#__PURE__*/React.createElement(RenderSingleRoute, {
             onMount: function onMount() {
               return _this2.setState({
-                mathIndex: index
+                matchIndex: index
               });
             }
           })
         });
-      })), this.state.matchIndex > -1 && routes[this.state.matchIndex].element, /*#__PURE__*/React.createElement(RenderSingleRoute, {
-        onMount: function onMount() {
-          return _this2.isRender = true;
-        }
-      }));
+      })), component && /*#__PURE__*/React.cloneElement(component, props));
     }
   }]);
 
   return AppRoute;
-}(React.PureComponent);
+}(React.Component);
 
 AppRoute.defaultProps = {
   routes: []

package/es/LoaderApp/index.js

@@ -108,7 +108,6 @@ function LoaderApp(_ref) {
       var props = Object.assign(Object.assign({}, appProps), {
         container: domRef.current
       });
-      console.debug('执行更新！', appProps);
       loadedAppRef.current.update && loadedAppRef.current.update(props);
     }
   }, [appProps.currentId, appProps.tabId, appProps.updateTime]);

package/package.json

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