easy3wmui 0.0.42-beta18 → 0.0.42-beta19

package/lib/Easy3wMGlobalFooter/index.js

@@ -29,52 +29,18 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 var Easy3wMGlobalFooter = function (_Component) {
   (0, _inherits3['default'])(Easy3wMGlobalFooter, _Component);
 
-  function Easy3wMGlobalFooter(props) {
+  function Easy3wMGlobalFooter() {
     (0, _classCallCheck3['default'])(this, Easy3wMGlobalFooter);
-
-    var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
-
-    _this.touchFooterStyle = function () {
-      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 {
-        _this.setState({
-          bottomFixed: false // 是否固定于页面底部
-        });
-      }
-    };
-
-    _this.state = {
-      bottomFixed: false // 是否固定于页面底部
-    };
-    return _this;
+    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
   }
 
-  Easy3wMGlobalFooter.prototype.componentDidMount = function componentDidMount() {};
-
-  Easy3wMGlobalFooter.prototype.componentWillUnmount = function componentWillUnmount() {};
-  // 底部样式监听
-
-
   Easy3wMGlobalFooter.prototype.render = function render() {
-    var bottomFixed = this.state.bottomFixed;
     var _props = this.props,
-        globalLoading = _props.globalLoading,
+        bottomFixed = _props.bottomFixed,
         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

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

package/lib/Easy3wMUserLayout/index.js

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

package/package.json

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