easy3wmui 0.0.42-beta17 → 0.0.42-beta18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -58,24 +58,23 @@ var Easy3wMGlobalFooter = function (_Component) {
|
|
|
58
58
|
return _this;
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
Easy3wMGlobalFooter.prototype.componentDidMount = function componentDidMount() {
|
|
62
|
-
window.onhashchange = this.touchFooterStyle;
|
|
63
|
-
window.onload = this.touchFooterStyle;
|
|
64
|
-
};
|
|
61
|
+
Easy3wMGlobalFooter.prototype.componentDidMount = function componentDidMount() {};
|
|
65
62
|
|
|
66
|
-
Easy3wMGlobalFooter.prototype.componentWillUnmount = function componentWillUnmount() {
|
|
67
|
-
window.onhashchange = null;
|
|
68
|
-
};
|
|
63
|
+
Easy3wMGlobalFooter.prototype.componentWillUnmount = function componentWillUnmount() {};
|
|
69
64
|
// 底部样式监听
|
|
70
65
|
|
|
71
66
|
|
|
72
67
|
Easy3wMGlobalFooter.prototype.render = function render() {
|
|
73
68
|
var bottomFixed = this.state.bottomFixed;
|
|
74
69
|
var _props = this.props,
|
|
70
|
+
globalLoading = _props.globalLoading,
|
|
75
71
|
className = _props.className,
|
|
76
72
|
links = _props.links,
|
|
77
73
|
copyright = _props.copyright;
|
|
78
74
|
|
|
75
|
+
if (globalLoading === false) {
|
|
76
|
+
window.onload = this.touchFooterStyle;
|
|
77
|
+
}
|
|
79
78
|
var clsString = (0, _classnames2['default'])(className, { bottomFixed: bottomFixed });
|
|
80
79
|
return _react2['default'].createElement(
|
|
81
80
|
'div',
|
|
@@ -80,7 +80,8 @@ var Easy3wMInsideLayout = function (_Component) {
|
|
|
80
80
|
includeCopyRightFlag = _props.includeCopyRightFlag,
|
|
81
81
|
links = _props.links,
|
|
82
82
|
copyrightContent = _props.copyrightContent,
|
|
83
|
-
routeDataLayout = _props.routeDataLayout
|
|
83
|
+
routeDataLayout = _props.routeDataLayout,
|
|
84
|
+
globalLoading = _props.globalLoading;
|
|
84
85
|
|
|
85
86
|
var hadHaederFlag = includeHeaderFlag !== '0';
|
|
86
87
|
var copyRightFlag = includeCopyRightFlag !== '0';
|
|
@@ -120,6 +121,7 @@ var Easy3wMInsideLayout = function (_Component) {
|
|
|
120
121
|
)
|
|
121
122
|
),
|
|
122
123
|
copyRightFlag ? _react2['default'].createElement(_Easy3wMGlobalFooter2['default'], {
|
|
124
|
+
globalLoading: globalLoading,
|
|
123
125
|
links: links,
|
|
124
126
|
copyright: copyright
|
|
125
127
|
}) : ''
|
|
@@ -78,6 +78,7 @@ var Easy3wMUserLayout = function (_PureComponent) {
|
|
|
78
78
|
copyrightContent = _props.copyrightContent,
|
|
79
79
|
headerElem = _props.headerElem,
|
|
80
80
|
links = _props.links,
|
|
81
|
+
globalLoading = _props.globalLoading,
|
|
81
82
|
rootRedirectPath = _props.rootRedirectPath,
|
|
82
83
|
routeDataLayout = _props.routeDataLayout,
|
|
83
84
|
backImg = _props.backImg,
|
|
@@ -123,6 +124,7 @@ var Easy3wMUserLayout = function (_PureComponent) {
|
|
|
123
124
|
)
|
|
124
125
|
),
|
|
125
126
|
copyRightFlag ? _react2['default'].createElement(_Easy3wMGlobalFooter2['default'], {
|
|
127
|
+
globalLoading: globalLoading,
|
|
126
128
|
links: links,
|
|
127
129
|
copyright: copyright
|
|
128
130
|
}) : ''
|