easy3wmui 0.0.42-beta16 → 0.0.42-beta18

package/lib/Easy3wMGlobalFooter/index.js

@@ -35,26 +35,20 @@ var Easy3wMGlobalFooter = function (_Component) {
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
     _this.touchFooterStyle = function () {
-      if (document.hidden) {
-        // 页面挂起
-        // alert('页面挂起');
-        console.log('页面挂起');
+      var element = document.getElementById('Easy3wMGlobalFooter');
+      var viewHeight = window.innerHeight; // 目标可视区的高度
+      var elementBottom = element.getBoundingClientRect().bottom; // 目标div上边框距离可视区的上边界的距离
+      // elementTop === viewHeight div上边框正好与可视区下边框重叠
+      if (elementBottom < viewHeight) {
+        // 达到目标区域
+        // console.log('div出现在可视区！');
+        _this.setState({
+          bottomFixed: true // 是否固定于页面底部
+        });
       } else {
-        // 页面呼出
-        // alert('页面呼出');
-        console.log('页面呼出');
-        var element = document.getElementById('Easy3wMGlobalFooter');
-        // console.log('elementelement', element);
-        var viewHeight = window.innerHeight; // 目标可视区的高度
-        var elementBottom = element.getBoundingClientRect().bottom; // 目标div上边框距离可视区的上边界的距离
-        // elementTop === viewHeight div上边框正好与可视区下边框重叠
-        if (elementBottom < viewHeight) {
-          // 达到目标区域
-          // console.log('div出现在可视区！');
-          _this.setState({
-            bottomFixed: true // 是否固定于页面底部
-          });
-        }
+        _this.setState({
+          bottomFixed: false // 是否固定于页面底部
+        });
       }
     };
 
@@ -64,27 +58,23 @@ var Easy3wMGlobalFooter = function (_Component) {
     return _this;
   }
 
-  Easy3wMGlobalFooter.prototype.componentDidMount = function componentDidMount() {
-    var _this2 = this;
+  Easy3wMGlobalFooter.prototype.componentDidMount = function componentDidMount() {};
 
-    window.onload = function () {
-      document.addEventListener('visibilitychange', _this2.touchFooterStyle);
-    };
-  };
-
-  Easy3wMGlobalFooter.prototype.componentWillUnmount = function componentWillUnmount() {
-    document.removeEventListener('visibilitychange', this.touchFooterStyle);
-  };
+  Easy3wMGlobalFooter.prototype.componentWillUnmount = function componentWillUnmount() {};
   // 底部样式监听
 
 
   Easy3wMGlobalFooter.prototype.render = function render() {
     var bottomFixed = this.state.bottomFixed;
     var _props = this.props,
+        globalLoading = _props.globalLoading,
         className = _props.className,
         links = _props.links,
         copyright = _props.copyright;
 
+    if (globalLoading === false) {
+      window.onload = this.touchFooterStyle;
+    }
     var clsString = (0, _classnames2['default'])(className, { bottomFixed: bottomFixed });
     return _react2['default'].createElement(
       'div',

package/lib/Easy3wMInsideLayout/index.js

@@ -80,7 +80,8 @@ var Easy3wMInsideLayout = function (_Component) {
         includeCopyRightFlag = _props.includeCopyRightFlag,
         links = _props.links,
         copyrightContent = _props.copyrightContent,
-        routeDataLayout = _props.routeDataLayout;
+        routeDataLayout = _props.routeDataLayout,
+        globalLoading = _props.globalLoading;
 
     var hadHaederFlag = includeHeaderFlag !== '0';
     var copyRightFlag = includeCopyRightFlag !== '0';
@@ -120,6 +121,7 @@ var Easy3wMInsideLayout = function (_Component) {
         )
       ),
       copyRightFlag ? _react2['default'].createElement(_Easy3wMGlobalFooter2['default'], {
+        globalLoading: globalLoading,
         links: links,
         copyright: copyright
       }) : ''

package/lib/Easy3wMUserLayout/index.js

@@ -78,6 +78,7 @@ var Easy3wMUserLayout = function (_PureComponent) {
         copyrightContent = _props.copyrightContent,
         headerElem = _props.headerElem,
         links = _props.links,
+        globalLoading = _props.globalLoading,
         rootRedirectPath = _props.rootRedirectPath,
         routeDataLayout = _props.routeDataLayout,
         backImg = _props.backImg,
@@ -123,6 +124,7 @@ var Easy3wMUserLayout = function (_PureComponent) {
           )
         ),
         copyRightFlag ? _react2['default'].createElement(_Easy3wMGlobalFooter2['default'], {
+          globalLoading: globalLoading,
           links: links,
           copyright: copyright
         }) : ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wmui",
-  "version": "0.0.42-beta16",
+  "version": "0.0.42-beta18",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",