easy3wmui 0.0.42-beta8 → 0.0.42

package/lib/Easy3wMGridPage/index.js

@@ -74,7 +74,9 @@ var Easy3wMGridPage = function (_Component) {
 
   Easy3wMGridPage.prototype.componentWillUnmount = function componentWillUnmount() {};
   // --------------------------------------------- 分页 start ---------------------------------------------
-  // 切换页数
+  // 生成分页数字
+
+  // 按钮翻页
 
   // 触发查询
 
@@ -97,7 +99,8 @@ var Easy3wMGridPage = function (_Component) {
         _props$dataList = _props.dataList,
         dataList = _props$dataList === undefined ? [] : _props$dataList,
         collapseFlag = _props.collapseFlag,
-        needPaginationFlag = _props.needPaginationFlag;
+        needPaginationFlag = _props.needPaginationFlag,
+        paginationNumBtnFlag = _props.paginationNumBtnFlag;
     var totalResult = this.props.totalResult;
 
     if (totalResult) {
@@ -121,6 +124,17 @@ var Easy3wMGridPage = function (_Component) {
         offset = _state.offset,
         limit = _state.limit;
 
+    var intTotalPage = Math.ceil(totalResult / 10);
+    var btn2 = this.touchCreatePageNum(intTotalPage, offset, 2);
+    var btnText2 = typeof btn2 === 'string' ? _react2['default'].createElement(_antdMobileIcons.MoreOutline, null) : btn2;
+    var btn3 = this.touchCreatePageNum(intTotalPage, offset, 3);
+    var btnText3 = typeof btn3 === 'string' ? _react2['default'].createElement(_antdMobileIcons.MoreOutline, null) : btn3;
+    var btn4 = this.touchCreatePageNum(intTotalPage, offset, 4);
+    var btnText4 = typeof btn4 === 'string' ? _react2['default'].createElement(_antdMobileIcons.MoreOutline, null) : btn4;
+    var btn5 = this.touchCreatePageNum(intTotalPage, offset, 5);
+    var btnText5 = typeof btn5 === 'string' ? _react2['default'].createElement(_antdMobileIcons.MoreOutline, null) : btn5;
+    var btn6 = this.touchCreatePageNum(intTotalPage, offset, 6);
+    var btnText6 = typeof btn6 === 'string' ? _react2['default'].createElement(_antdMobileIcons.MoreOutline, null) : btn6;
     return _react2['default'].createElement(
       'div',
       { id: 'Easy3wMGridPage' },
@@ -142,13 +156,79 @@ var Easy3wMGridPage = function (_Component) {
         null,
         _react2['default'].createElement(_easy3wmui.Easy3wMEmpty, (0, _extends3['default'])({}, emptyProps, { description: emptyProps.description || '暂无数据' }))
       ),
-      totalResult && !collapseFlag || collapseFlag && needPaginationFlag && totalResult ? _react2['default'].createElement(
+      totalResult && !collapseFlag || collapseFlag && needPaginationFlag && totalResult ? paginationNumBtnFlag ? _react2['default'].createElement(
+        'div',
+        { className: 'easy3wMGridPageStepper' },
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === 1 ? 'emgpsBtnDisable' : ''), onClick: offset === 1 ? function () {} : function () {
+              return _this2.touchChangePage(offset - 1);
+            } },
+          _react2['default'].createElement(_antdMobileIcons.LeftOutline, null)
+        ),
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === 1 ? 'emgpsBtnActive' : ''), onClick: offset === 1 ? function () {} : function () {
+              return _this2.touchChangePage(1);
+            } },
+          '1'
+        ),
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === btn2 ? 'emgpsBtnActive' : '') + ' ' + (btn2 >= intTotalPage ? 'emgpsBtnNo' : ''), onClick: offset === btn2 ? function () {} : function () {
+              return _this2.touchChangePage(btn2);
+            } },
+          btnText2
+        ),
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === btn3 ? 'emgpsBtnActive' : '') + ' ' + (btn3 >= intTotalPage ? 'emgpsBtnNo' : ''), onClick: offset === btn3 ? function () {} : function () {
+              return _this2.touchChangePage(btn3);
+            } },
+          btnText3
+        ),
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === btn4 ? 'emgpsBtnActive' : '') + ' ' + (btn4 >= intTotalPage ? 'emgpsBtnNo' : ''), onClick: offset === btn4 ? function () {} : function () {
+              return _this2.touchChangePage(btn4);
+            } },
+          btnText4
+        ),
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === btn5 ? 'emgpsBtnActive' : '') + ' ' + (btn5 >= intTotalPage || intTotalPage > 999 ? 'emgpsBtnNo' : ''), onClick: offset === btn5 ? function () {} : function () {
+              return _this2.touchChangePage(btn5);
+            } },
+          btnText5
+        ),
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === btn6 ? 'emgpsBtnActive' : '') + ' ' + (btn6 >= intTotalPage || intTotalPage > 999 ? 'emgpsBtnNo' : ''), onClick: offset === btn6 ? function () {} : function () {
+              return _this2.touchChangePage(btn6);
+            } },
+          btnText6
+        ),
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === intTotalPage ? 'emgpsBtnActive' : '') + ' ' + (intTotalPage > 1 ? '' : 'emgpsBtnNo'), onClick: offset === intTotalPage ? function () {} : function () {
+              return _this2.touchChangePage(intTotalPage);
+            } },
+          intTotalPage
+        ),
+        _react2['default'].createElement(
+          'span',
+          { className: 'emgpsBtn ' + (offset === intTotalPage ? 'emgpsBtnDisable' : ''), onClick: offset === intTotalPage ? function () {} : function () {
+              return _this2.touchChangePage(offset + 1);
+            } },
+          _react2['default'].createElement(_antdMobileIcons.RightOutline, null)
+        )
+      ) : _react2['default'].createElement(
         'div',
         { className: 'easy3wMGridPageStepper' },
         _react2['default'].createElement(
           _button2['default'],
           { color: 'default', fill: 'none', onClick: function onClick() {
-              return _this2.onChange('minus');
+              return _this2.touchChangePage(offset - 1);
             }, disabled: offset === 1 },
           _react2['default'].createElement(_antdMobileIcons.LeftOutline, null)
         ),
@@ -165,7 +245,7 @@ var Easy3wMGridPage = function (_Component) {
         _react2['default'].createElement(
           _button2['default'],
           { color: 'default', fill: 'none', onClick: function onClick() {
-              return _this2.onChange('add');
+              return _this2.touchChangePage(offset + 1);
             }, disabled: offset === Math.ceil(totalResult / limit) },
           _react2['default'].createElement(_antdMobileIcons.RightOutline, null)
         )
@@ -179,13 +259,99 @@ var Easy3wMGridPage = function (_Component) {
 var _initialiseProps = function _initialiseProps() {
   var _this3 = this;
 
-  this.onChange = function (operationType) {
+  this.touchCreatePageNum = function (intTotalPage, offset, index) {
+    var btnNum = intTotalPage > 999 ? 5 : 7;
+    /*
+      intTotalPage 总页数
+      offset 当前分页
+      btnNum 按钮数量
+        intTotalPage <= btnNum
+      <,1,2,3,4,5,6,7,> 删除6，7
+        intTotalPage > btnNum
+      offset - 3 <= 1
+      <,1,2,3,4,5,+5,intTotalPage,> 删除第三及倒数第三个按钮
+        intTotalPage > btnNum
+      offset - 3 > 1 &&  offset + 3 < intTotalPage
+      <,1,-5,6,7,8,+5,intTotalPage,> 删除第三及倒数第三个按钮
+        intTotalPage > btnNum
+      offset - 3 > 1 && offset + 3 >= intTotalPage
+      <,1,-5,6,7,8,9,intTotalPage,> 删除第三及倒数第三个按钮
+    */
+    if (intTotalPage <= btnNum) {
+      return index;
+    } else if (btnNum === 5 && intTotalPage > btnNum && offset - 2 < 1) {
+      if (index === 4) {
+        return '+5';
+      } else {
+        return index;
+      }
+    } else if (btnNum === 5 && intTotalPage > btnNum && offset - 2 >= 1 && offset + 2 <= intTotalPage) {
+      if (index === 4) {
+        return '+5';
+      } else if (index === 2) {
+        return '-5';
+      } else {
+        return offset;
+      }
+    } else if (btnNum === 5 && offset - 2 >= 1 && offset + 2 > intTotalPage) {
+      if (index === 2) {
+        // <1,-5,6,7,8>
+        return '-5';
+      } else if (index === 3) {
+        return intTotalPage - 2;
+      } else if (index === 4) {
+        return intTotalPage - 1;
+      }
+    } else if (btnNum === 7 && intTotalPage > btnNum && offset - 3 <= 1) {
+      if (index === 6) {
+        // 1,2,3,4,5,+5,intTotalPage
+        return '+5';
+      } else {
+        return index;
+      }
+    } else if (btnNum === 7 && intTotalPage > btnNum && offset - 3 > 1 && offset + 3 < intTotalPage) {
+      if (index === 2) {
+        return '-5';
+      } else if (index === 3) {
+        return offset - 1;
+      } else if (index === 4) {
+        return offset;
+      } else if (index === 5) {
+        return offset + 1;
+      } else if (index === 6) {
+        return '+5';
+      }
+    } else if (btnNum === 7 && intTotalPage > btnNum && offset - 3 > 1 && offset + 3 >= intTotalPage) {
+      if (index === 2) {
+        return '-5';
+      } else if (index === 3) {
+        return intTotalPage - 4;
+      } else if (index === 4) {
+        return intTotalPage - 3;
+      } else if (index === 5) {
+        return intTotalPage - 2;
+      } else if (index === 6) {
+        return intTotalPage - 1;
+      }
+    }
+  };
+
+  this.touchChangePage = function (num) {
+    var totalResult = _this3.props.totalResult;
+
+    var intTotalPage = Math.ceil(totalResult / 10);
+    // const intTotalPage = 99999;
     var offset = _this3.state.offset;
 
-    if (operationType === 'minus') {
-      offset -= 1;
-    } else if (operationType === 'add') {
-      offset += 1;
+    if (typeof num === 'string') {
+      offset += Number(num);
+    } else {
+      offset = num;
+    }
+    if (offset < 1) {
+      offset = 1;
+    } else if (offset > intTotalPage) {
+      offset = intTotalPage;
     }
     _this3.setState({
       offset: offset // 当前页

package/lib/Easy3wMLogin/index.js

@@ -56,6 +56,12 @@ var Easy3wMLogin = function (_Component) {
 
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
+    _this.onChange = function (key) {
+      _this.setState({
+        activeKey: key // 标签页的key
+      });
+    };
+
     _this.checkCaptcha = function (rule, value, callback) {
       var captcharesult = _this.state.captcharesult;
 
@@ -75,6 +81,52 @@ var Easy3wMLogin = function (_Component) {
       });
     };
 
+    _this.touchSetPassword = function () {
+      var visible = _this.state.visible;
+
+      _this.setState({
+        visible: !visible // 密码显示隐藏
+      });
+    };
+
+    _this.toPage = function (operationType) {
+      var toPage = _this.props.toPage;
+
+      if (toPage && typeof toPage === 'function') {
+        toPage(operationType);
+      }
+    };
+
+    _this.showModal = function (operationType) {
+      var showModal = _this.props.showModal;
+
+      if (showModal && typeof showModal === 'function') {
+        showModal(operationType);
+      }
+    };
+
+    _this.touchSendCode = function () {
+      var touchSendCode = _this.props.touchSendCode;
+
+      if (touchSendCode && typeof touchSendCode === 'function') {
+        touchSendCode(function (countProps) {
+          var count = countProps || 59;
+          _this.setState({
+            count: count // 验证码时间
+          });
+          _this.interval = setInterval(function () {
+            count -= 1;
+            _this.setState({
+              count: count // 验证码时间
+            });
+            if (count === 0) {
+              clearInterval(_this.interval);
+            }
+          }, 1000);
+        });
+      }
+    };
+
     _this.submitAccountLogin = function (values) {
       var handleOk = _this.props.handleOk;
       // this.props.form.validateFields().then((values) => {
@@ -85,17 +137,15 @@ var Easy3wMLogin = function (_Component) {
       // });
     };
 
-    _this.touchSetPassword = function () {
-      var visible = _this.state.visible;
-
-      _this.setState({
-        visible: !visible // 密码显示隐藏
-      });
-    };
+    var activeKey = _this.props.activeKey;
 
     _this.state = {
+      activeKey: activeKey || 'account', // 标签页的key
+      // 账号密码登录
       captcharesult: '', // 验证码--state
-      visible: false // 密码显示隐藏
+      visible: false, // 密码显示隐藏
+      // 账号密码登录
+      count: 0 // 手机验证码登录
     };
     return _this;
   }
@@ -103,16 +153,34 @@ var Easy3wMLogin = function (_Component) {
   Easy3wMLogin.prototype.componentWillUnmount = function componentWillUnmount() {};
   // 生成form实例
   // formRef = React.createRef()
+  // 切换标签页
+
+  // --------------------------------------- 账号密码登录 start ---------------------------------------
   // 校验验证码
 
   // 生成校验码
 
-  // 提交
-
   // 密码显示隐藏
 
+  // 跳转忘记密码
+
+  // 显示联系客服弹窗
+
+  // --------------------------------------- 账号密码登录 end -----------------------------------------
+  // --------------------------------------- 手机验证码登录 start ---------------------------------------
+  // 发送验证码
+
+  // --------------------------------------- 手机验证码登录 end -----------------------------------------
+  // 提交
+
 
   Easy3wMLogin.prototype.render = function render() {
+    var _this2 = this;
+
+    var _state = this.state,
+        visible = _state.visible,
+        activeKey = _state.activeKey,
+        count = _state.count;
     var _props = this.props,
         form = _props.form,
         status = _props.status,
@@ -124,30 +192,45 @@ var Easy3wMLogin = function (_Component) {
         account = _ref.account,
         phone = _ref.phone;
 
-    var visible = this.state.visible;
-
     var errorMsgReal = errorMsg || '账户或密码错误';
     return _react2['default'].createElement(
       'div',
       { id: 'Easy3wMLogin' },
       _react2['default'].createElement(
         _tabs2['default'],
-        { activeKey: 'account', onChange: this.onChange },
+        { activeKey: activeKey, onChange: this.onChange },
         account ? _react2['default'].createElement(
           Tab,
-          { title: '\u8D26\u53F7\u5BC6\u7801\u767B\u5F55', key: 'account' },
+          { title: '\u8D26\u53F7\u5BC6\u7801\u767B\u5F55', key: 'account', destroyOnClose: true },
           _react2['default'].createElement(
             _form2['default'],
             {
-              // ref={this.formRef}
               onFinish: this.submitAccountLogin,
               form: form,
-              layout: 'horizontal' // 字段与
-              , name: 'login',
+              layout: 'horizontal' // 字段与字段值排列方式
+              , name: 'account',
               footer: // 表单尾部的内容，常常用来放置提交按钮
               _react2['default'].createElement(
                 'div',
                 null,
+                _react2['default'].createElement(
+                  'div',
+                  { className: 'funArea' },
+                  _react2['default'].createElement(
+                    'a',
+                    { onClick: function onClick() {
+                        return _this2.toPage('forgotPassword');
+                      } },
+                    '\u5FD8\u8BB0\u5BC6\u7801'
+                  ),
+                  _react2['default'].createElement(
+                    'a',
+                    { onClick: function onClick() {
+                        return _this2.showModal('customerService');
+                      } },
+                    '\u8054\u7CFB\u5BA2\u670D'
+                  )
+                ),
                 _react2['default'].createElement(
                   _button2['default'],
                   { color: 'primary', fill: 'solid', block: true, type: 'primary', htmlType: 'submit' },
@@ -196,24 +279,24 @@ var Easy3wMLogin = function (_Component) {
               _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801 \u4E0D\u533A\u5206\u5927\u5C0F\u5199' })
             )
           )
-        ) : phone ? _react2['default'].createElement(
+        ) : '',
+        phone ? _react2['default'].createElement(
           Tab,
-          { title: '\u624B\u673A\u9A8C\u8BC1\u7801\u767B\u5F55', key: 'account' },
+          { title: '\u624B\u673A\u9A8C\u8BC1\u7801\u767B\u5F55', key: 'phone', destroyOnClose: true },
           _react2['default'].createElement(
             _form2['default'],
             {
-              // ref={this.formRef}
-              onFinish: this.submitAccountLogin,
               form: form,
-              layout: 'horizontal' // 字段与
-              , name: 'login',
+              layout: 'horizontal' // 字段与字段值排列方式
+              , name: 'phone',
+              onFinish: this.submitAccountLogin,
               footer: // 表单尾部的内容，常常用来放置提交按钮
               _react2['default'].createElement(
                 'div',
                 null,
                 _react2['default'].createElement(
                   _button2['default'],
-                  { color: 'primary', fill: 'solid', block: true, type: 'primary', htmlType: 'submit' },
+                  { type: 'submit', color: 'primary', fill: 'solid', block: true },
                   '\u767B\u5F55'
                 )
               )
@@ -229,33 +312,24 @@ var Easy3wMLogin = function (_Component) {
             ) : '',
             _react2['default'].createElement(
               FormItem,
-              { name: 'userName', required: true },
-              _react2['default'].createElement(_input2['default'], { onClick: this.changePsmode, placeholder: '\u8BF7\u8F93\u5165\u7528\u6237\u540D' })
+              { name: 'phone', rules: [{ pattern: /^1\d{10}$/, required: true, message: '手机格式错误' }] },
+              _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u624B\u673A\u53F7' })
             ),
             _react2['default'].createElement(
               FormItem,
               {
-                name: 'password',
-                required: true,
-                extra: _react2['default'].createElement(
+                name: 'piccaptcha',
+                extra: count ? _react2['default'].createElement(
                   _button2['default'],
-                  {
-                    size: 'small',
-                    onClick: this.touchSetPassword,
-                    htmlType: 'button'
-                  },
-                  visible ? _react2['default'].createElement(_antdMobileIcons.EyeOutline, null) : _react2['default'].createElement(_antdMobileIcons.EyeInvisibleOutline, null)
+                  { size: 'small', type: 'button' },
+                  count,
+                  's'
+                ) : _react2['default'].createElement(
+                  _button2['default'],
+                  { size: 'small', type: 'button', onClick: this.touchSendCode },
+                  '\u53D1\u9001\u9A8C\u8BC1\u7801'
                 )
               },
-              _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u5BC6\u7801', type: visible ? 'text' : 'password' })
-            ),
-            _react2['default'].createElement(
-              FormItem,
-              {
-                name: 'piccaptcha',
-                rules: [{ required: true, message: '请输入验证码 不区分大小写' }, { validator: this.checkCaptcha }],
-                extra: _react2['default'].createElement(_easy3wmui.Easy3wMCaptcha, { touchCaptchaResult: this.touchCaptchaResult })
-              },
               _react2['default'].createElement(_input2['default'], { placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801 \u4E0D\u533A\u5206\u5927\u5C0F\u5199' })
             )
           )

package/lib/Easy3wMSpin/index.js

@@ -2,14 +2,6 @@
 
 exports.__esModule = true;
 
-var _spinLoading = require('antd-mobile/es/components/spin-loading');
-
-var _spinLoading2 = _interopRequireDefault(_spinLoading);
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
 var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -51,7 +43,12 @@ var Easy3wMSpin = function (_Component) {
       return _react2['default'].createElement(
         'div',
         { id: 'Easy3wMSpin' },
-        _react2['default'].createElement(_spinLoading2['default'], (0, _extends3['default'])({ color: 'primary', className: 'spinLoading' }, this.props))
+        _react2['default'].createElement('img', { src: 'common/easy3wloading.gif', alt: 'logo', style: { height: '14px', width: '14px' } }),
+        _react2['default'].createElement(
+          'div',
+          null,
+          '\u540E\u53F0\u5904\u7406\u4E2D......'
+        )
       );
     } else {
       return '';