fmui-base 2.0.53 → 2.0.54

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.54：移动门户添加下拉刷新
 - 2.0.53：移动门户日程部件多个显示问题
 - 2.0.52：移动门户部件标题字体
 - 2.0.51：移动门户部件样式修改

package/lib/react_grid/react_grid.js

@@ -49,6 +49,10 @@ var _Toast = require('saltui/lib/Toast');
 
 var _Toast2 = _interopRequireDefault(_Toast);
 
+var _Refreshcontrol = require('saltui/lib/Refreshcontrol');
+
+var _Refreshcontrol2 = _interopRequireDefault(_Refreshcontrol);
+
 require('react-grid-layout/css/styles.css');
 
 require('react-resizable/css/styles.css');
@@ -265,7 +269,6 @@ var MyGrid = function (_React$Component) {
     value: function componentDidMount() {
       this.initPage();
     }
-
     // 遍历初始化得到的data，奖id给请求部件的内容的接口
     // 如果有两个相同的部件，将会用id请求部件内容，接口返回的数据需要 this.setState({【id】:result.data});这样存值
     // 取值的时候根据id取值
@@ -380,7 +383,6 @@ var MyGrid = function (_React$Component) {
     value: function gotoYd() {
       pageSkipDirectly(_variables2.default.ydPath);
     }
-
     // 应用跳转
 
   }, {
@@ -1642,6 +1644,26 @@ var MyGrid = function (_React$Component) {
         componentContent
       );
     }
+
+    // 下拉刷新
+
+  }, {
+    key: 'onRefresh',
+    value: function onRefresh() {
+      var _this3 = this;
+
+      // debugger;
+      this.setState({ refreshing: true });
+      this.initPage();
+      // this.setState({
+      //   refreshing: false,
+      // });
+      setTimeout(function () {
+        _this3.setState({
+          refreshing: false
+        });
+      }, 1000);
+    }
   }, {
     key: 'render',
     value: function render() {
@@ -1667,21 +1689,25 @@ var MyGrid = function (_React$Component) {
           'div',
           { className: 'react-grid' },
           _react2.default.createElement(
-            _reactGridLayout2.default,
-            {
-              className: 'layout',
-              layout: layout,
-              cols: 12,
-              rowHeight: 20,
-              width: window.innerWidth,
-              isDraggable: this.state.isDraggable,
-              margin: [0, 5]
-            },
-            this.state.data.map(function (item) {
-              return t.portalContent(item) || null;
-
-              // 添加一个默认返回值，以避免未指定键的错误
-            })
+            _Refreshcontrol2.default,
+            { refreshing: this.state.refreshing, onRefresh: this.onRefresh.bind(this), beforePullLoadText: '\u4E0B\u62C9\u5237\u65B0', afterPullLoadText: '\u4E0B\u62C9\u5237\u65B0\u7ED3\u675F' },
+            _react2.default.createElement(
+              _reactGridLayout2.default,
+              {
+                className: 'layout',
+                layout: layout,
+                cols: 12,
+                rowHeight: 20,
+                width: window.innerWidth,
+                isDraggable: this.state.isDraggable,
+                margin: [0, 5]
+              },
+              this.state.data.map(function (item) {
+                return t.portalContent(item) || null;
+
+                // 添加一个默认返回值，以避免未指定键的错误
+              })
+            )
           )
         );
       }

package/lib/react_grid/react_grid.less

@@ -1048,5 +1048,30 @@
     border-left: none !important;
   }
 
+
+  .t-refresh-control{
+    .t-refresh-control-inner {
+      z-index: 0;
+    }
+  }
+
+  .t-refresh-control.ready {
+    .t-refresh-control-inner {
+      z-index: -1;
+    }
+  } 
+
+  .t-refresh-control.refreshAnimate.refreshing {
+    .t-refresh-control-inner {
+      z-index: 0;
+    }
+  }
+  
+  .t-refresh-control.refreshAnimate {
+    .t-refresh-control-inner {
+      z-index: -1;
+    }
+  }
+
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.0.53",
+  "version": "2.0.54",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",