easy3wmui 0.0.42-beta1 → 0.0.42-beta3

package/assets/index.css

@@ -72,6 +72,14 @@
   border-top: 0;
   border-bottom: 0;
 }
+:root:root .adm-form .adm-list-item-content-extra {
+  padding: 12px 0;
+}
+:root:root .adm-form .adm-form-item.adm-form-item-horizontal .adm-list-item-content-extra {
+  -ms-flex-item-align: auto;
+      -ms-grid-row-align: auto;
+      align-self: auto;
+}
 :root:root .adm-form .adm-form-footer {
   padding: 12px;
 }
@@ -225,17 +233,22 @@
   -ms-flex: none;
       flex: none;
 }
+#Easy3wMFormPage .adm-picker-view-mask {
+  z-index: 1;
+}
+#Easy3wMFormPage .adm-stepper {
+  width: 100%;
+}
 #Easy3wMGridPage .easy3wMGridPageStepper {
   display: -ms-flexbox;
   display: flex;
   -ms-flex-direction: row;
       flex-direction: row;
-  -ms-flex-align: center;
-      align-items: center;
   -ms-flex-pack: justify;
       justify-content: space-between;
-  padding: 12px;
-  background-color: #fff;
+  -ms-flex-align: center;
+      align-items: center;
+  background: #fff;
 }
 #Easy3wMGridPage .adm-collapse-panel-content > .adm-collapse-panel-content-inner > .adm-list-item > .adm-list-item-content > .adm-list-item-content-main {
   -ms-flex: auto;

package/assets/mFormPage.css

@@ -28,3 +28,9 @@
   -ms-flex: none;
       flex: none;
 }
+#Easy3wMFormPage .adm-picker-view-mask {
+  z-index: 1;
+}
+#Easy3wMFormPage .adm-stepper {
+  width: 100%;
+}

package/assets/mGridPage.css

@@ -3,12 +3,11 @@
   display: flex;
   -ms-flex-direction: row;
       flex-direction: row;
-  -ms-flex-align: center;
-      align-items: center;
   -ms-flex-pack: justify;
       justify-content: space-between;
-  padding: 12px;
-  background-color: #fff;
+  -ms-flex-align: center;
+      align-items: center;
+  background: #fff;
 }
 #Easy3wMGridPage .adm-collapse-panel-content > .adm-collapse-panel-content-inner > .adm-list-item > .adm-list-item-content > .adm-list-item-content-main {
   -ms-flex: auto;

package/lib/Easy3wMButton/index.less

@@ -1,5 +1,5 @@
 #Easy3wMButton {
-	.adm-space-item {
-		flex-grow: 1;
-	}
+  .adm-space-item {
+    flex-grow: 1;
+  }
 }

package/lib/Easy3wMCaptcha/index.js

@@ -31,91 +31,91 @@ var _antdMobile = require('antd-mobile');
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var Easy3wMCaptcha = function (_Component) {
-		(0, _inherits3['default'])(Easy3wMCaptcha, _Component);
-
-		function Easy3wMCaptcha(props) {
-				(0, _classCallCheck3['default'])(this, Easy3wMCaptcha);
-
-				var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
-
-				_this.renderCode = function () {
-						var expression = '';
-						var result = '';
-						if (_this.props.captchaType === 'Calculation') {
-								// 计算
-								result = 0;
-								var Calpre = Math.round(Math.random() * 100);
-								var Calafter = Math.round(Math.random() * 100);
-								var codeCal = ['-', '+', 'x'];
-								var i = Math.round(Math.random() * 2);
-								switch (codeCal[i]) {
-										case '-':
-												expression = Calpre + '-' + Calafter;
-												result = Calpre - Calafter;
-												break;
-										case '+':
-												expression = Calpre + '+' + Calafter;
-												result = Calpre + Calafter;
-												break;
-										case 'x':
-												expression = Calpre + 'x' + Calafter;
-												result = Calpre * Calafter;
-												break;
-										default:
-												break;
-								}
-						} else if (_this.props.captchaType === 'Normal') {
-								// 正常
-								result = '';
-								var strBx = 'ABCDEFGHJKMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789';
-								var codeNormal = strBx.split('');
-								for (var _i = 0; _i < _this.props.csize; _i += 1) {
-										result += codeNormal[Math.round(Math.random() * (strBx.length - 1))];
-								}
-								expression = result.toLowerCase(); // 表达式小写化
-						}
-						_this.props.touchCaptchaResult(expression); // 将验证码返回给调用组件
-						_this.setState({
-								expression: expression
-						});
-				};
-
-				_this.state = {
-						expression: '' // 表达示
-				};
-				return _this;
-		}
-
-		Easy3wMCaptcha.prototype.componentDidMount = function componentDidMount() {
-				this.renderCode();
-		};
-		// 生成随机码
-
-
-		Easy3wMCaptcha.prototype.render = function render() {
-				var expression = this.state.expression;
-
-				return _react2['default'].createElement(
-						_button2['default'],
-						{
-								size: 'small',
-								onClick: this.renderCode,
-								htmlType: 'button'
-						},
-						expression
-				);
-		};
-
-		return Easy3wMCaptcha;
+  (0, _inherits3['default'])(Easy3wMCaptcha, _Component);
+
+  function Easy3wMCaptcha(props) {
+    (0, _classCallCheck3['default'])(this, Easy3wMCaptcha);
+
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
+
+    _this.renderCode = function () {
+      var expression = '';
+      var result = '';
+      if (_this.props.captchaType === 'Calculation') {
+        // 计算
+        result = 0;
+        var Calpre = Math.round(Math.random() * 100);
+        var Calafter = Math.round(Math.random() * 100);
+        var codeCal = ['-', '+', 'x'];
+        var i = Math.round(Math.random() * 2);
+        switch (codeCal[i]) {
+          case '-':
+            expression = Calpre + '-' + Calafter;
+            result = Calpre - Calafter;
+            break;
+          case '+':
+            expression = Calpre + '+' + Calafter;
+            result = Calpre + Calafter;
+            break;
+          case 'x':
+            expression = Calpre + 'x' + Calafter;
+            result = Calpre * Calafter;
+            break;
+          default:
+            break;
+        }
+      } else if (_this.props.captchaType === 'Normal') {
+        // 正常
+        result = '';
+        var strBx = 'ABCDEFGHJKMNPQRSTUVWXYZabcdefghjkmnpqrstuvwxyz23456789';
+        var codeNormal = strBx.split('');
+        for (var _i = 0; _i < _this.props.csize; _i += 1) {
+          result += codeNormal[Math.round(Math.random() * (strBx.length - 1))];
+        }
+        expression = result.toLowerCase(); // 表达式小写化
+      }
+      _this.props.touchCaptchaResult(expression); // 将验证码返回给调用组件
+      _this.setState({
+        expression: expression
+      });
+    };
+
+    _this.state = {
+      expression: '' // 表达示
+    };
+    return _this;
+  }
+
+  Easy3wMCaptcha.prototype.componentDidMount = function componentDidMount() {
+    this.renderCode();
+  };
+  // 生成随机码
+
+
+  Easy3wMCaptcha.prototype.render = function render() {
+    var expression = this.state.expression;
+
+    return _react2['default'].createElement(
+      _button2['default'],
+      {
+        size: 'small',
+        onClick: this.renderCode,
+        htmlType: 'button'
+      },
+      expression
+    );
+  };
+
+  return Easy3wMCaptcha;
 }(_react.Component);
 
 Easy3wMCaptcha.defaultProps = {
-		csize: 4, // 验证码长度
-		captchaType: 'Normal' // 正常验证码类型
+  csize: 4, // 验证码长度
+  captchaType: 'Normal' // 正常验证码类型
 };
 Easy3wMCaptcha.propTypes = { // 限制变量类型
-		csize: _propTypes2['default'].number,
-		captchaType: _propTypes2['default'].oneOf(['Calculation', 'Normal'])
+  csize: _propTypes2['default'].number,
+  captchaType: _propTypes2['default'].oneOf(['Calculation', 'Normal'])
 };
 exports['default'] = Easy3wMCaptcha;
 module.exports = exports['default'];

package/lib/Easy3wMCard/index.less

@@ -1,5 +1,5 @@
 #Easy3wMCard {
-	.adm-card-header-title {
-		--adm-font-size-7: 14px;
-	}
+  .adm-card-header-title {
+    --adm-font-size-7: 14px;
+  }
 }

package/lib/Easy3wMFormPage/index.js

@@ -176,7 +176,7 @@ var Easy3wMFormPage = function (_Component) {
             value = (0, _moment2['default'])(value, dateWeekDayFormat).format(dateWeekDayZHCNFormat);
           } else if (numberFormat) {
             // 数字格式化千分位化
-            (0, _numeral2['default'])(value).format('0,0.00');
+            value = (0, _numeral2['default'])(value).format('0,0.00');
           }
         } else {
           // 编辑

package/lib/Easy3wMFormPage/index.less

@@ -1,49 +1,48 @@
 #Easy3wMFormPage {
-	.pointer { // 鼠标形状：手形
-		cursor: pointer;
-	}
-	.pointerGray { // 鼠标形状：手形 文字：灰色
-		cursor: pointer;
-		color: #999
-	}
-	.adm-input-element {
-		border: 1px solid #d9d9d9;
-	}
-	.adm-input-element:focus, .adm-input-element:hover {
-		border-color: var(--adm-color-primary);
-	}
-	.adm-text-area-element {
-		border: 1px solid #d9d9d9;
-	}
-	.adm-text-area-element:focus, .adm-text-area-element:hover {
-		border-color: var(--adm-color-primary);
-	}
-	.adm-rate {
-		--star-size: 14px
-	}
-	.adm-radio, .adm-checkbox {
-		--icon-size: 14px;
-		--font-size: 14px;
-	}
-	.adm-switch {
-		--height: 20.8px;
-	}
-	.adm-slider {
-		padding: 0;
-	}
-	.adm-list-default .adm-list-body {
-		border-top: 0;
-		border-bottom: 0;
-	}
-	.adm-list-item {
-		border-bottom: var(--border-bottom);
-		margin: 0 12px;
-		padding-left: 0;
+  .pointer { // 鼠标形状：手形
+    cursor: pointer;
+  }
+  .pointerGray { // 鼠标形状：手形 文字：灰色
+    cursor: pointer;
+    color: #999
+  }
+  .adm-input-element {
+    border: 1px solid #d9d9d9;
+  }
+  .adm-input-element:focus, .adm-input-element:hover {
+    border-color: var(--adm-color-primary);
+  }
+  .adm-text-area-element {
+    border: 1px solid #d9d9d9;
+  }
+  .adm-text-area-element:focus, .adm-text-area-element:hover {
+    border-color: var(--adm-color-primary);
+  }
+  .adm-rate {
+    --star-size: 14px
+  }
+  .adm-radio, .adm-checkbox {
+    --icon-size: 14px;
+    --font-size: 14px;
+  }
+  .adm-switch {
+    --height: 20.8px;
+  }
+  .adm-slider {
+    padding: 0;
+  }
+  .adm-list-default .adm-list-body {
+    border-top: 0;
+    border-bottom: 0;
+  }
+  .adm-list-item {
+    border-bottom: var(--border-bottom);
+    margin: 0 12px;
+    padding-left: 0;
     word-break: break-word;
-	}
-	// 主内容
-	.adm-list-item-content {
-		border-top: 0;
-		padding-right: 0;
-	}
+  }
+  .adm-list-item-content {
+    border-top: 0;
+    padding-right: 0;
+  }
 }

package/lib/Easy3wMGlobalFooter/index.less

@@ -1,3 +1,3 @@
 #Easy3wMGlobalFooter {
-	text-align: center;
+  text-align: center;
 }

package/lib/Easy3wMGridPage/index copy.js

@@ -0,0 +1,298 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
+
+var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
+
+var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
+
+var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
+
+var _inherits2 = require('babel-runtime/helpers/inherits');
+
+var _inherits3 = _interopRequireDefault(_inherits2);
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _numeral = require('numeral');
+
+var _numeral2 = _interopRequireDefault(_numeral);
+
+var _easy3wmui = require('easy3wmui');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+// import Easy3wMCollapse from '../Easy3wMCollapse';
+// import Easy3wMEmpty from '../Easy3wMEmpty';
+// import Easy3wMStepper from '../Easy3wMStepper';
+// import Easy3wMList from '../Easy3wMList';
+// import Easy3wMCard from '../Easy3wMCard';
+// import Easy3wMSpace from '../Easy3wMSpace';
+
+var Panel = _easy3wmui.Easy3wMCollapse.Panel;
+var Item = _easy3wmui.Easy3wMList.Item;
+
+var Easy3wMGridPage = function (_Component) {
+  (0, _inherits3['default'])(Easy3wMGridPage, _Component);
+
+  function Easy3wMGridPage(props) {
+    (0, _classCallCheck3['default'])(this, Easy3wMGridPage);
+
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
+
+    _this.onChange = function (current) {
+      _this.setState({
+        currentIndex: current
+      });
+    };
+
+    _this.touchFormatData = function (dataItem, columnItem) {
+      var key = columnItem.key,
+          dataIndex = columnItem.dataIndex,
+          numberFormat = columnItem.numberFormat;
+
+      var fieldId = dataIndex || key;
+      var value = dataItem[fieldId];
+      if (value || value === false || value === 0) {
+        // value值存在  Boolean()值为false的7个特殊值   undefined， null， false， NaN， ''， 0， -0
+        if (numberFormat) {
+          var thousandthValue = (0, _numeral2['default'])(dataItem[fieldId]).format('0,0.00');
+          value = thousandthValue;
+        }
+        return value;
+      } else {
+        // value值不存在
+        return '';
+      }
+    };
+
+    _this.renderEasy3wMGridPage = function (dataList) {
+      var currentIndex = _this.state.currentIndex;
+      var _this$props = _this.props,
+          _this$props$panelProp = _this$props.panelProps,
+          panelProps = _this$props$panelProp === undefined ? {} : _this$props$panelProp,
+          _this$props$listProps = _this$props.listProps,
+          listProps = _this$props$listProps === undefined ? {} : _this$props$listProps,
+          _this$props$itemProps = _this$props.itemProps,
+          itemProps = _this$props$itemProps === undefined ? {} : _this$props$itemProps,
+          _this$props$columns = _this$props.columns,
+          columns = _this$props$columns === undefined ? [] : _this$props$columns,
+          panelTitle = _this$props.panelTitle,
+          panelKey = _this$props.panelKey,
+          _this$props$expandedR = _this$props.expandedRowRender,
+          expandedRowRender = _this$props$expandedR === undefined ? function () {} : _this$props$expandedR,
+          collapseFlag = _this$props.collapseFlag;
+      // collapseProps 折叠面板容器参数
+      // panelProps 折叠面板参数
+      // emptyProps 空状态参数
+      // stepperProps 步进器参数
+      // listProps 列表参数
+      // itemProps 列表项参数
+      // columns 字段列表
+      // dataList 列表数据
+      // totalResult 列表记录数量
+      // panelTitle panel标题 数据类型：string或function
+      // panelKey panel唯一标识 数据类型：string或function
+      // expandedRowRender 可扩展行
+
+      if (collapseFlag) {
+        return dataList.map(function (item, index) {
+          var title = typeof panelTitle === 'function' ? panelTitle(item, index) : item[panelTitle] || '';
+          var key = typeof panelKey === 'function' ? panelKey(item, index) : item[panelKey] || index;
+          return (// 折叠面板
+            _react2['default'].createElement(
+              Panel,
+              (0, _extends3['default'])({}, panelProps, { title: title, key: key }),
+              _this.renderEasy3wMGridPageItem(item, index)
+            )
+          );
+        });
+      } else {
+        return _this.renderEasy3wMGridPageItem(dataList[currentIndex - 1], currentIndex - 1);
+      }
+    };
+
+    _this.renderEasy3wMGridPageItem = function (dataItem, index) {
+      var children = dataItem.children;
+      var _this$props2 = _this.props,
+          _this$props2$panelPro = _this$props2.panelProps,
+          panelProps = _this$props2$panelPro === undefined ? {} : _this$props2$panelPro,
+          _this$props2$listProp = _this$props2.listProps,
+          listProps = _this$props2$listProp === undefined ? {} : _this$props2$listProp,
+          _this$props2$itemProp = _this$props2.itemProps,
+          itemProps = _this$props2$itemProp === undefined ? {} : _this$props2$itemProp,
+          _this$props2$columns = _this$props2.columns,
+          columns = _this$props2$columns === undefined ? [] : _this$props2$columns,
+          panelTitle = _this$props2.panelTitle,
+          panelKey = _this$props2.panelKey,
+          _this$props2$expanded = _this$props2.expandedRowRender,
+          expandedRowRender = _this$props2$expanded === undefined ? function () {} : _this$props2$expanded;
+      // collapseProps 折叠面板容器参数
+      // panelProps 折叠面板参数
+      // emptyProps 空状态参数
+      // stepperProps 步进器参数
+      // listProps 列表参数
+      // itemProps 列表项参数
+      // columns 字段列表
+      // dataList 列表数据
+      // totalResult 列表记录数量
+      // panelTitle panel标题
+      // panelKey panel唯一标识
+      // expandedRowRender 可扩展行
+
+      return (// 单项数据
+        _react2['default'].createElement(
+          _easy3wmui.Easy3wMList,
+          listProps,
+          columns.map(function (column) {
+            if (column.children) {
+              return _react2['default'].createElement(
+                _easy3wmui.Easy3wMList,
+                (0, _extends3['default'])({ mode: 'card' }, listProps, { header: column.title }),
+                column.children.map(function (childrenColumn) {
+                  var type = childrenColumn.type;
+
+                  var childrenFieldId = childrenColumn.dataIndex || childrenColumn.key;
+                  var childrenExtra = childrenColumn.render ? childrenColumn.render(dataItem[childrenFieldId], dataItem, index) : _this.touchFormatData(dataItem, childrenColumn);
+                  if (type === 'longText') {
+                    return _react2['default'].createElement(Item, (0, _extends3['default'])({ className: 'e3wmLongText' }, itemProps, { title: childrenColumn.title, description: childrenExtra }));
+                  } else {
+                    return _react2['default'].createElement(Item, (0, _extends3['default'])({}, itemProps, { title: childrenColumn.title, extra: childrenExtra }));
+                  }
+                })
+              );
+            } else {
+              var title = column.title,
+                  key = column.key,
+                  dataIndex = column.dataIndex,
+                  type = column.type;
+
+              var fieldId = dataIndex || key;
+              var extra = column.render ? column.render(dataItem[fieldId], dataItem, index) : _this.touchFormatData(dataItem, column);
+              if (type === 'longText') {
+                return _react2['default'].createElement(Item, (0, _extends3['default'])({ className: 'e3wmLongText' }, itemProps, { title: title, description: extra }));
+              } else {
+                return _react2['default'].createElement(Item, (0, _extends3['default'])({}, itemProps, { title: title, extra: extra }));
+              }
+            }
+          }),
+          children ? _this.renderEasy3wMGridPage(children) : '',
+          expandedRowRender ? expandedRowRender(dataItem) : ''
+        )
+      );
+    };
+
+    _this.state = {
+      currentIndex: 1, // 当前显示内容数据的索引
+      paginationInfo: { // 分页
+        offset: 1,
+        limit: 10
+      }
+    };
+    return _this;
+  }
+
+  Easy3wMGridPage.prototype.componentWillUnmount = function componentWillUnmount() {};
+  // 切换行数据
+
+  // 数据格式化
+
+  // 渲染列表
+
+  // 渲染列表单项
+
+
+  Easy3wMGridPage.prototype.render = function render() {
+    var _props = this.props,
+        _props$collapseProps = _props.collapseProps,
+        collapseProps = _props$collapseProps === undefined ? {} : _props$collapseProps,
+        _props$emptyProps = _props.emptyProps,
+        emptyProps = _props$emptyProps === undefined ? {} : _props$emptyProps,
+        _props$panelProps = _props.panelProps,
+        panelProps = _props$panelProps === undefined ? {} : _props$panelProps,
+        _props$stepperProps = _props.stepperProps,
+        stepperProps = _props$stepperProps === undefined ? {} : _props$stepperProps,
+        _props$dataList = _props.dataList,
+        dataList = _props$dataList === undefined ? [] : _props$dataList,
+        totalResult = _props.totalResult,
+        collapseFlag = _props.collapseFlag;
+    // collapseProps 折叠面板容器参数
+    // panelProps 折叠面板参数
+    // emptyProps 空状态参数
+    // stepperProps 步进器参数
+    // listProps 列表参数
+    // itemProps 列表项参数
+    // columns 字段列表
+    // dataList 列表数据
+    // totalResult 列表记录数量
+    // panelTitle panel标题
+    // panelKey panel唯一标识
+    // collapseFlag 是否折叠面板 true 是 false 否
+
+    var currentIndex = this.state.currentIndex;
+
+    return _react2['default'].createElement(
+      'div',
+      { id: 'Easy3wMGridPage' },
+      dataList && dataList.length ? _react2['default'].createElement(
+        'div',
+        null,
+        collapseFlag ? _react2['default'].createElement(
+          _easy3wmui.Easy3wMCollapse,
+          collapseProps,
+          this.renderEasy3wMGridPage(dataList)
+        ) : _react2['default'].createElement(
+          'div',
+          null,
+          this.renderEasy3wMGridPage(dataList)
+        )
+      ) : // 空状态
+      _react2['default'].createElement(
+        _easy3wmui.Easy3wMCard,
+        null,
+        _react2['default'].createElement(_easy3wmui.Easy3wMEmpty, (0, _extends3['default'])({}, emptyProps, { description: emptyProps.description || '暂无数据' }))
+      ),
+      dataList && dataList.length && !collapseFlag ? _react2['default'].createElement(
+        _easy3wmui.Easy3wMCard,
+        null,
+        _react2['default'].createElement(
+          'div',
+          { className: 'easy3wMGridPageStepper' },
+          _react2['default'].createElement(
+            _easy3wmui.Easy3wMSpace,
+            null,
+            _react2['default'].createElement(
+              'span',
+              null,
+              '\u5171',
+              dataList.length,
+              '\u6761'
+            ),
+            _react2['default'].createElement(_easy3wmui.Easy3wMStepper, (0, _extends3['default'])({}, stepperProps, {
+              step: 1 // 每次改变步数，可以为小数
+              , digits: 0 // 格式化到小数点后固定位数，设置为 0 表示格式化到整数
+              , min: 1 // 最小值
+              , max: dataList.length // 最大值
+              , inputReadOnly: true // 输入框是否只读
+              , onChange: this.onChange // 变化时的回调
+              , value: currentIndex // 当前数，受控值
+            }))
+          )
+        )
+      ) : null
+    );
+  };
+
+  return Easy3wMGridPage;
+}(_react.Component);
+
+exports['default'] = Easy3wMGridPage;
+module.exports = exports['default'];

package/lib/Easy3wMGridPage/index.js

@@ -30,10 +30,10 @@ var _numeral = require('numeral');
 
 var _numeral2 = _interopRequireDefault(_numeral);
 
-var _antdMobileIcons = require('antd-mobile-icons');
-
 var _antdMobile = require('antd-mobile');
 
+var _antdMobileIcons = require('antd-mobile-icons');
+
 var _easy3wmui = require('easy3wmui');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
@@ -56,157 +56,29 @@ var Easy3wMGridPage = function (_Component) {
 
     var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
-    _this.onChange = function (current) {
-      _this.setState({
-        currentIndex: current
-      });
-    };
-
-    _this.touchFormatData = function (dataItem, columnItem) {
-      var key = columnItem.key,
-          dataIndex = columnItem.dataIndex,
-          numberFormat = columnItem.numberFormat;
-
-      var fieldId = dataIndex || key;
-      var value = dataItem[fieldId];
-      if (value || value === false || value === 0) {
-        // value值存在  Boolean()值为false的7个特殊值   undefined， null， false， NaN， ''， 0， -0
-        if (numberFormat) {
-          var thousandthValue = (0, _numeral2['default'])(dataItem[fieldId]).format('0,0.00');
-          value = thousandthValue;
-        }
-        return value;
-      } else {
-        // value值不存在
-        return '';
-      }
-    };
+    _initialiseProps.call(_this);
 
-    _this.renderEasy3wMGridPage = function (dataList) {
-      var currentIndex = _this.state.currentIndex;
-      var _this$props = _this.props,
-          _this$props$panelProp = _this$props.panelProps,
-          panelProps = _this$props$panelProp === undefined ? {} : _this$props$panelProp,
-          _this$props$listProps = _this$props.listProps,
-          listProps = _this$props$listProps === undefined ? {} : _this$props$listProps,
-          _this$props$itemProps = _this$props.itemProps,
-          itemProps = _this$props$itemProps === undefined ? {} : _this$props$itemProps,
-          _this$props$columns = _this$props.columns,
-          columns = _this$props$columns === undefined ? [] : _this$props$columns,
-          panelTitle = _this$props.panelTitle,
-          panelKey = _this$props.panelKey,
-          _this$props$expandedR = _this$props.expandedRowRender,
-          expandedRowRender = _this$props$expandedR === undefined ? function () {} : _this$props$expandedR,
-          collapseFlag = _this$props.collapseFlag;
-      // collapseProps 折叠面板容器参数
-      // panelProps 折叠面板参数
-      // emptyProps 空状态参数
-      // stepperProps 步进器参数
-      // listProps 列表参数
-      // itemProps 列表项参数
-      // columns 字段列表
-      // dataList 列表数据
-      // totalResult 列表记录数量
-      // panelTitle panel标题 数据类型：string或function
-      // panelKey panel唯一标识 数据类型：string或function
-      // expandedRowRender 可扩展行
-
-      if (collapseFlag) {
-        return dataList.map(function (item, index) {
-          var title = typeof panelTitle === 'function' ? panelTitle(item, index) : item[panelTitle] || '';
-          var key = typeof panelKey === 'function' ? panelKey(item, index) : item[panelKey] || index;
-          return (// 折叠面板
-            _react2['default'].createElement(
-              Panel,
-              (0, _extends3['default'])({}, panelProps, { title: title, key: key }),
-              _this.renderEasy3wMGridPageItem(item, index)
-            )
-          );
-        });
-      } else {
-        return _this.renderEasy3wMGridPageItem(dataList[currentIndex - 1], currentIndex - 1);
-      }
-    };
-
-    _this.renderEasy3wMGridPageItem = function (dataItem, index) {
-      var children = dataItem.children;
-      var _this$props2 = _this.props,
-          _this$props2$panelPro = _this$props2.panelProps,
-          panelProps = _this$props2$panelPro === undefined ? {} : _this$props2$panelPro,
-          _this$props2$listProp = _this$props2.listProps,
-          listProps = _this$props2$listProp === undefined ? {} : _this$props2$listProp,
-          _this$props2$itemProp = _this$props2.itemProps,
-          itemProps = _this$props2$itemProp === undefined ? {} : _this$props2$itemProp,
-          _this$props2$columns = _this$props2.columns,
-          columns = _this$props2$columns === undefined ? [] : _this$props2$columns,
-          panelTitle = _this$props2.panelTitle,
-          panelKey = _this$props2.panelKey,
-          _this$props2$expanded = _this$props2.expandedRowRender,
-          expandedRowRender = _this$props2$expanded === undefined ? function () {} : _this$props2$expanded;
-      // collapseProps 折叠面板容器参数
-      // panelProps 折叠面板参数
-      // emptyProps 空状态参数
-      // stepperProps 步进器参数
-      // listProps 列表参数
-      // itemProps 列表项参数
-      // columns 字段列表
-      // dataList 列表数据
-      // totalResult 列表记录数量
-      // panelTitle panel标题
-      // panelKey panel唯一标识
-      // expandedRowRender 可扩展行
-
-      return (// 单项数据
-        _react2['default'].createElement(
-          _easy3wmui.Easy3wMList,
-          listProps,
-          columns.map(function (column) {
-            if (column.children) {
-              return _react2['default'].createElement(
-                _easy3wmui.Easy3wMList,
-                (0, _extends3['default'])({ mode: 'card' }, listProps, { header: column.title }),
-                column.children.map(function (childrenColumn) {
-                  var type = childrenColumn.type;
-
-                  var childrenFieldId = childrenColumn.dataIndex || childrenColumn.key;
-                  var childrenExtra = childrenColumn.render ? childrenColumn.render(dataItem[childrenFieldId], dataItem, index) : _this.touchFormatData(dataItem, childrenColumn);
-                  if (type === 'longText') {
-                    return _react2['default'].createElement(Item, (0, _extends3['default'])({ className: 'e3wmLongText' }, itemProps, { title: childrenColumn.title, description: childrenExtra }));
-                  } else {
-                    return _react2['default'].createElement(Item, (0, _extends3['default'])({}, itemProps, { title: childrenColumn.title, extra: childrenExtra }));
-                  }
-                })
-              );
-            } else {
-              var title = column.title,
-                  key = column.key,
-                  dataIndex = column.dataIndex,
-                  type = column.type;
-
-              var fieldId = dataIndex || key;
-              var extra = column.render ? column.render(dataItem[fieldId], dataItem, index) : _this.touchFormatData(dataItem, column);
-              if (type === 'longText') {
-                return _react2['default'].createElement(Item, (0, _extends3['default'])({ className: 'e3wmLongText' }, itemProps, { title: title, description: extra }));
-              } else {
-                return _react2['default'].createElement(Item, (0, _extends3['default'])({}, itemProps, { title: title, extra: extra }));
-              }
-            }
-          }),
-          children ? _this.renderEasy3wMGridPage(children) : '',
-          expandedRowRender ? expandedRowRender(dataItem) : ''
-        )
-      );
-    };
+    var collapseFlag = _this.props.collapseFlag;
 
     _this.state = {
-      currentIndex: 1 // 当前显示内容数据的索引
+      // 分页信息 折叠面板形式每页10条，非折叠面板每页1条
+      offset: 1, // 当前分页
+      limit: collapseFlag ? 10 : 1 // 每页条数
+      // paginationInfo: { // 分页
+      //   offset: 1,
+      //   limit: 10,
+      // },
     };
     return _this;
   }
 
   Easy3wMGridPage.prototype.componentWillUnmount = function componentWillUnmount() {};
-  // 切换行数据
+  // --------------------------------------------- 分页 start ---------------------------------------------
+  // 切换页数
 
+  // 触发查询
+
+  // --------------------------------------------- 分页 end -----------------------------------------------
   // 数据格式化
 
   // 渲染列表
@@ -222,14 +94,17 @@ var Easy3wMGridPage = function (_Component) {
         collapseProps = _props$collapseProps === undefined ? {} : _props$collapseProps,
         _props$emptyProps = _props.emptyProps,
         emptyProps = _props$emptyProps === undefined ? {} : _props$emptyProps,
-        _props$panelProps = _props.panelProps,
-        panelProps = _props$panelProps === undefined ? {} : _props$panelProps,
-        _props$stepperProps = _props.stepperProps,
-        stepperProps = _props$stepperProps === undefined ? {} : _props$stepperProps,
         _props$dataList = _props.dataList,
         dataList = _props$dataList === undefined ? [] : _props$dataList,
-        totalResult = _props.totalResult,
-        collapseFlag = _props.collapseFlag;
+        collapseFlag = _props.collapseFlag,
+        needPaginationFlag = _props.needPaginationFlag;
+    var totalResult = this.props.totalResult;
+
+    if (totalResult) {
+      // 有总数就使用总数，无总数直接使用数组长度
+    } else if (dataList && dataList.length) {
+      totalResult = dataList.length;
+    }
     // collapseProps 折叠面板容器参数
     // panelProps 折叠面板参数
     // emptyProps 空状态参数
@@ -242,8 +117,9 @@ var Easy3wMGridPage = function (_Component) {
     // panelTitle panel标题
     // panelKey panel唯一标识
     // collapseFlag 是否折叠面板 true 是 false 否
-
-    var currentIndex = this.state.currentIndex;
+    var _state = this.state,
+        offset = _state.offset,
+        limit = _state.limit;
 
     return _react2['default'].createElement(
       'div',
@@ -266,60 +142,191 @@ var Easy3wMGridPage = function (_Component) {
         null,
         _react2['default'].createElement(_easy3wmui.Easy3wMEmpty, (0, _extends3['default'])({}, emptyProps, { description: emptyProps.description || '暂无数据' }))
       ),
-      dataList && dataList.length && !collapseFlag ? _react2['default'].createElement(
-        'div',
-        { className: 'easy3wMGridPageStepper' },
-        _react2['default'].createElement(
-          _easy3wmui.Easy3wMSpace,
-          null,
-          _react2['default'].createElement(
-            'span',
-            null,
-            '\u5171',
-            dataList.length,
-            '\u6761'
-          ),
-          _react2['default'].createElement(_easy3wmui.Easy3wMStepper, (0, _extends3['default'])({}, stepperProps, {
-            step: 1 // 每次改变步数，可以为小数
-            , digits: 0 // 格式化到小数点后固定位数，设置为 0 表示格式化到整数
-            , min: 1 // 最小值
-            , max: dataList.length // 最大值
-            , inputReadOnly: true // 输入框是否只读
-            , onChange: this.onChange // 变化时的回调
-            , value: currentIndex // 当前数，受控值
-          }))
-        )
-      ) : null,
-      totalResult && collapseFlag ? _react2['default'].createElement(
+      totalResult && !collapseFlag || collapseFlag && needPaginationFlag && totalResult ? _react2['default'].createElement(
         'div',
         { className: 'easy3wMGridPageStepper' },
         _react2['default'].createElement(
           _button2['default'],
-          { color: 'default', fill: 'outline', onClick: function onClick() {
+          { color: 'default', fill: 'none', onClick: function onClick() {
               return _this2.onChange('minus');
-            }, disabled: currentIndex === 1 },
-          _react2['default'].createElement(_antdMobileIcons.MinusOutline, null)
+            }, disabled: offset === 1 },
+          _react2['default'].createElement(_antdMobileIcons.LeftOutline, null)
         ),
         _react2['default'].createElement(
           'span',
           null,
-          currentIndex,
+          offset,
           '/',
-          Math.ceil(totalResult / 10)
+          Math.ceil(totalResult / limit),
+          '  \u5171',
+          totalResult,
+          '\u6761'
         ),
         _react2['default'].createElement(
           _button2['default'],
-          { color: 'default', fill: 'outline', onClick: function onClick() {
+          { color: 'default', fill: 'none', onClick: function onClick() {
               return _this2.onChange('add');
-            }, disabled: currentIndex === Math.ceil(totalResult / 10) },
-          _react2['default'].createElement(_antdMobileIcons.AddOutline, null)
+            }, disabled: offset === Math.ceil(totalResult / limit) },
+          _react2['default'].createElement(_antdMobileIcons.RightOutline, null)
         )
-      ) : null
+      ) : ''
     );
   };
 
   return Easy3wMGridPage;
 }(_react.Component);
 
+var _initialiseProps = function _initialiseProps() {
+  var _this3 = this;
+
+  this.onChange = function (operationType) {
+    var offset = _this3.state.offset;
+
+    if (operationType === 'minus') {
+      offset -= 1;
+    } else if (operationType === 'add') {
+      offset += 1;
+    }
+    _this3.setState({
+      offset: offset // 当前页
+    }, _this3.touchSearch);
+  };
+
+  this.touchSearch = function () {
+    var handleSearch = _this3.props.handleSearch;
+    var _state2 = _this3.state,
+        offset = _state2.offset,
+        limit = _state2.limit;
+
+    if (handleSearch && typeof handleSearch === 'function') {
+      handleSearch({ offset: offset, limit: limit });
+    }
+  };
+
+  this.touchFormatData = function (dataItem, columnItem) {
+    var key = columnItem.key,
+        dataIndex = columnItem.dataIndex,
+        numberFormat = columnItem.numberFormat;
+
+    var fieldId = dataIndex || key;
+    var value = dataItem[fieldId];
+    if (value || value === false || value === 0) {
+      // value值存在  Boolean()值为false的7个特殊值   undefined， null， false， NaN， ''， 0， -0
+      if (numberFormat) {
+        var thousandthValue = (0, _numeral2['default'])(dataItem[fieldId]).format('0,0.00');
+        value = thousandthValue;
+      }
+      return value;
+    } else {
+      // value值不存在
+      return '';
+    }
+  };
+
+  this.renderEasy3wMGridPage = function (dataList) {
+    var offset = _this3.state.offset;
+    var _props2 = _this3.props,
+        _props2$panelProps = _props2.panelProps,
+        panelProps = _props2$panelProps === undefined ? {} : _props2$panelProps,
+        panelTitle = _props2.panelTitle,
+        panelKey = _props2.panelKey,
+        collapseFlag = _props2.collapseFlag;
+    // collapseProps 折叠面板容器参数
+    // panelProps 折叠面板参数
+    // emptyProps 空状态参数
+    // stepperProps 步进器参数
+    // listProps 列表参数
+    // itemProps 列表项参数
+    // columns 字段列表
+    // dataList 列表数据
+    // totalResult 列表记录数量
+    // panelTitle panel标题 数据类型：string或function
+    // panelKey panel唯一标识 数据类型：string或function
+    // expandedRowRender 可扩展行
+
+    if (collapseFlag) {
+      return dataList.map(function (item, index) {
+        var title = typeof panelTitle === 'function' ? panelTitle(item, index) : item[panelTitle] || '';
+        var key = typeof panelKey === 'function' ? panelKey(item, index) : item[panelKey] || index;
+        return (// 折叠面板
+          _react2['default'].createElement(
+            Panel,
+            (0, _extends3['default'])({}, panelProps, { title: title, key: key }),
+            _this3.renderEasy3wMGridPageItem(item, index)
+          )
+        );
+      });
+    } else {
+      return _this3.renderEasy3wMGridPageItem(dataList[offset - 1], offset - 1);
+    }
+  };
+
+  this.renderEasy3wMGridPageItem = function (dataItem, index) {
+    var children = dataItem.children;
+    var _props3 = _this3.props,
+        _props3$listProps = _props3.listProps,
+        listProps = _props3$listProps === undefined ? {} : _props3$listProps,
+        _props3$itemProps = _props3.itemProps,
+        itemProps = _props3$itemProps === undefined ? {} : _props3$itemProps,
+        _props3$columns = _props3.columns,
+        columns = _props3$columns === undefined ? [] : _props3$columns,
+        _props3$expandedRowRe = _props3.expandedRowRender,
+        expandedRowRender = _props3$expandedRowRe === undefined ? function () {} : _props3$expandedRowRe;
+    // collapseProps 折叠面板容器参数
+    // panelProps 折叠面板参数
+    // emptyProps 空状态参数
+    // stepperProps 步进器参数
+    // listProps 列表参数
+    // itemProps 列表项参数
+    // columns 字段列表
+    // dataList 列表数据
+    // totalResult 列表记录数量
+    // panelTitle panel标题
+    // panelKey panel唯一标识
+    // expandedRowRender 可扩展行
+
+    return (// 单项数据
+      _react2['default'].createElement(
+        _easy3wmui.Easy3wMList,
+        listProps,
+        columns.map(function (column) {
+          if (column.children) {
+            return _react2['default'].createElement(
+              _easy3wmui.Easy3wMList,
+              (0, _extends3['default'])({ mode: 'card' }, listProps, { header: column.title }),
+              column.children.map(function (childrenColumn) {
+                var type = childrenColumn.type;
+
+                var childrenFieldId = childrenColumn.dataIndex || childrenColumn.key;
+                var childrenExtra = childrenColumn.render ? childrenColumn.render(dataItem[childrenFieldId], dataItem, index) : _this3.touchFormatData(dataItem, childrenColumn);
+                if (type === 'longText') {
+                  return _react2['default'].createElement(Item, (0, _extends3['default'])({ className: 'e3wmLongText' }, itemProps, { title: childrenColumn.title, description: childrenExtra }));
+                } else {
+                  return _react2['default'].createElement(Item, (0, _extends3['default'])({}, itemProps, { title: childrenColumn.title, extra: childrenExtra }));
+                }
+              })
+            );
+          } else {
+            var title = column.title,
+                key = column.key,
+                dataIndex = column.dataIndex,
+                type = column.type;
+
+            var fieldId = dataIndex || key;
+            var extra = column.render ? column.render(dataItem[fieldId], dataItem, index) : _this3.touchFormatData(dataItem, column);
+            if (type === 'longText') {
+              return _react2['default'].createElement(Item, (0, _extends3['default'])({ className: 'e3wmLongText' }, itemProps, { title: title, description: extra }));
+            } else {
+              return _react2['default'].createElement(Item, (0, _extends3['default'])({}, itemProps, { title: title, extra: extra }));
+            }
+          }
+        }),
+        children ? _this3.renderEasy3wMGridPage(children) : '',
+        expandedRowRender ? expandedRowRender(dataItem) : ''
+      )
+    );
+  };
+};
+
 exports['default'] = Easy3wMGridPage;
 module.exports = exports['default'];

package/lib/Easy3wMGridPage/index.less

@@ -1,7 +1,7 @@
 #Easy3wMGridPage {
-	.easy3wMGridPageStepper {
-		display: flex;
-		flex-direction: column;
-		align-items: flex-end;
-	}
+  .easy3wMGridPageStepper {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+  }
 }

package/lib/Easy3wMSpin/index.less

@@ -1,15 +1,15 @@
 #Easy3wMSpin { // 锁屏加载
-	position: fixed;
-	background: rgba(255, 255, 255, 0);
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	z-index: 9999;
-	.spinLoading { // 内容
-		position: relative;
-		left: 50%;
-		top: 50%;
-		--size: 48px;
-	}
+  position: fixed;
+  background: rgba(255, 255, 255, 0);
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  z-index: 9999;
+  .spinLoading { // 内容
+    position: relative;
+    left: 50%;
+    top: 50%;
+    --size: 48px;
+  }
 }

package/lib/Easy3wMUserLayout/index.less

@@ -1,11 +1,11 @@
 #Easy3wMUserLayout {
-	.Easy3wMUserLayoutContent { // 内容
-		background-color: #f0f2f5;
-		width: 100%;
-		min-height: 100%;
-		background-repeat: no-repeat;
-		background-position: center;
-		background-size: 100%;
-		padding: 40px 0 0 0;
-	}
+  .Easy3wMUserLayoutContent { // 内容
+    background-color: #f0f2f5;
+    width: 100%;
+    min-height: 100%;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 100%;
+    padding: 40px 0 0 0;
+  }
 }

package/package.json

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

package/lib/Easy3wMForm/index.less

@@ -1,9 +0,0 @@
-.adm-form {
-	// 尾部附加内容
-	.adm-list-item-content-extra {
-		padding: 12px 0;
-	}
-	.adm-form-item.adm-form-item-horizontal .adm-list-item-content-extra {
-		align-self: auto;
-	}
-}