easy3wmui 0.0.42-beta3 → 0.0.42-beta30

package/assets/index.css

@@ -1,9 +1,9 @@
 :root:root {
   --adm-color-text: #000;
-  --adm-font-size-main: var(--adm-font-size-4);
+  --adm-font-size-main: var(--adm-font-size-7);
 }
 :root:root .adm-tabs {
-  --title-font-size: var(--adm-font-size-6);
+  --title-font-size: var(--adm-font-size-8);
   --content-padding: 0;
 }
 :root:root .adm-tabs-header {
@@ -14,27 +14,21 @@
   text-align: center;
 }
 :root:root .adm-button {
-  font-size: var(--adm-font-size-4);
+  font-size: var(--adm-font-size-7);
 }
 :root:root .adm-card-header-title {
-  font-size: var(--adm-font-size-6);
+  font-size: var(--adm-font-size-8);
   font-weight: normal;
 }
 :root:root .adm-input {
-  --font-size: var(--adm-font-size-4);
-}
-:root:root .adm-input-element {
-  border: 1px solid #d9d9d9;
+  --font-size: var(--adm-font-size-7);
 }
 :root:root .adm-input-element:focus,
 :root:root .adm-input-element:hover {
   border-color: var(--adm-color-primary);
 }
 :root:root .adm-text-area {
-  --font-size: var(--adm-font-size-4);
-}
-:root:root .adm-text-area-element {
-  border: 1px solid #d9d9d9;
+  --font-size: var(--adm-font-size-7);
 }
 :root:root .adm-text-area-element:focus,
 :root:root .adm-text-area-element:hover {
@@ -44,15 +38,15 @@
   font-size: var(--adm-font-size-4);
 }
 :root:root .adm-selector {
-  font-size: var(--adm-font-size-4);
+  font-size: var(--adm-font-size-7);
 }
 :root:root .adm-rate {
-  --star-size: var(--adm-font-size-4);
+  --star-size: var(--adm-font-size-7);
 }
 :root:root .adm-radio,
 :root:root .adm-checkbox {
-  --icon-size: var(--adm-font-size-4);
-  --font-size: var(--adm-font-size-4);
+  --icon-size: var(--adm-font-size-7);
+  --font-size: var(--adm-font-size-7);
   margin-right: 6px;
 }
 :root:root .adm-switch {
@@ -62,11 +56,11 @@
   padding: 0;
 }
 :root:root .adm-list-header {
-  --header-font-size: var(--adm-font-size-6);
+  --header-font-size: var(--adm-font-size-8);
   border-bottom: var(--border-bottom);
 }
 :root:root .adm-list-body {
-  --font-size: var(--adm-font-size-4);
+  --font-size: var(--adm-font-size-5);
 }
 :root:root .adm-list-default .adm-list-body {
   border-top: 0;
@@ -79,12 +73,14 @@
   -ms-flex-item-align: auto;
       -ms-grid-row-align: auto;
       align-self: auto;
+  line-height: 24px;
+  padding-left: 6px;
 }
 :root:root .adm-form .adm-form-footer {
   padding: 12px;
 }
 :root:root .adm-form-item.adm-form-item-vertical .adm-form-item-label {
-  font-size: var(--adm-font-size-4);
+  font-size: var(--adm-font-size-5);
   margin-bottom: 0;
   padding-bottom: 12px;
 }
@@ -105,10 +101,10 @@
   padding-right: 0;
 }
 :root:root .adm-list-item-content-extra {
-  font-size: var(--adm-font-size-4);
+  font-size: var(--adm-font-size-7);
 }
 :root:root .adm-collapse-panel-header {
-  font-size: var(--adm-font-size-6);
+  font-size: var(--adm-font-size-7);
   color: var(--adm-color-text);
 }
 :root:root .adm-list-item.adm-plain-anchor.adm-collapse-panel-header {
@@ -128,6 +124,9 @@
 :root:root .adm-list-item-content-extra {
   color: var(--adm-color-text);
 }
+:root:root .adm-checkbox .adm-checkbox-icon {
+  border-radius: 0px;
+}
 #Easy3wMButton {
   background: #fff;
 }
@@ -171,27 +170,31 @@
 }
 #Easy3wMSpin {
   position: fixed;
-  background: rgba(255, 255, 255, 0);
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  background: #fff;
+  top: 92px;
+  left: 49%;
+  margin-left: -69px;
   z-index: 9999;
+  text-align: center;
+  padding: 12px 24px;
+  color: var(--adm-color-primary);
+  border-radius: 2px;
+  box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
 }
-#Easy3wMSpin .spinLoading {
-  position: relative;
-  left: 50%;
-  top: 50%;
-  --size: 48px;
+#Easy3wMUserLayout {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: column;
+      flex-direction: column;
+  height: 100%;
 }
 #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;
+  -ms-flex-positive: 1;
+      flex-grow: 1;
 }
 #Easy3wMCard .adm-card {
   padding: 0;
@@ -217,9 +220,13 @@
   border-bottom: var(--border-bottom);
   margin-bottom: 12px;
 }
+#Easy3wMFormPage .adm-form-item-label {
+  line-height: 24px;
+}
 #Easy3wMFormPage .adm-list-item-content-main {
   color: var(--adm-color-text);
   text-align: right;
+  line-height: 24px;
 }
 #Easy3wMFormPage .adm-list-item-content-prefix {
   width: auto;
@@ -239,6 +246,15 @@
 #Easy3wMFormPage .adm-stepper {
   width: 100%;
 }
+#Easy3wMFormPage .adm-stepper .adm-input-element {
+  border: none;
+}
+#Easy3wMFormPage .adm-text-area-element {
+  line-height: inherit;
+}
+#Easy3wMFormPage .adm-input {
+  --text-align: right;
+}
 #Easy3wMGridPage .easy3wMGridPageStepper {
   display: -ms-flexbox;
   display: flex;
@@ -304,6 +320,7 @@
   height: 40px;
   border-radius: 4px;
   padding: 0 12px;
+  border: 1px solid #d9d9d9;
 }
 #Easy3wMLogin .errorMsgReal {
   background: #fff1f0;
@@ -335,3 +352,84 @@
   border-left: 0;
   background-color: transparent;
 }
+#Easy3wMLogin .funArea {
+  text-align: right;
+  margin-bottom: 24px;
+}
+#Easy3wMLogin .funArea > a {
+  padding-right: 12px;
+}
+#Easy3wMLogin .funArea > a:last-child {
+  padding-right: 0;
+}
+#Easy3wMTable {
+  --padding: 6px;
+}
+#Easy3wMTable .queryCriteria .more {
+  padding: 0 12px;
+}
+#Easy3wMTable .queryCriteria .adm-button {
+  font-size: var(--adm-font-size-6);
+}
+#Easy3wMTable .queryCriteria .adm-list-item-content-extra {
+  font-size: var(--adm-font-size-6);
+  padding: 0;
+}
+#Easy3wMTable .queryCriteriaBtn {
+  margin-top: 24px;
+}
+#Easy3wMTable .singleItem .itemAttr {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: stretch;
+      align-items: stretch;
+  -ms-flex-pack: start;
+      justify-content: flex-start;
+  padding-bottom: var(--padding);
+}
+#Easy3wMTable .singleItem .itemAttr .attrLabel {
+  width: auto;
+  max-width: 70%;
+  -ms-flex: none;
+      flex: none;
+  padding-right: var(--padding);
+  color: var(--adm-color-weak);
+}
+#Easy3wMTable .singleItem .itemAttr .attrKey {
+  text-align: right;
+  -ms-flex: auto;
+      flex: auto;
+  color: var(--adm-color-text);
+}
+#Easy3wMTable .singleItem .itemAttr .attrKey.clickable {
+  color: var(--adm-color-primary);
+}
+#Easy3wMTable .singleItem .itemAttr:last-child {
+  padding-bottom: 0;
+}
+#Easy3wMTable .singleItem .itemAttr.clickable {
+  cursor: pointer;
+  color: var(--adm-color-primary);
+}
+#Easy3wMTable .singleItem .itemAttr.clickable .attrLabel {
+  color: var(--adm-color-primary);
+}
+#Easy3wMTable .singleItem .itemAttr.clickable .attrKey {
+  color: var(--adm-color-primary);
+}
+#Easy3wMTable .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;
+}
+#Easy3wMTable .easy3wMGridPageStepper .adm-button {
+  font-size: var(--adm-font-size-6);
+  padding-left: 24px;
+  padding-right: 24px;
+}

package/assets/mFormPage.css

@@ -12,9 +12,13 @@
   border-bottom: var(--border-bottom);
   margin-bottom: 12px;
 }
+#Easy3wMFormPage .adm-form-item-label {
+  line-height: 24px;
+}
 #Easy3wMFormPage .adm-list-item-content-main {
   color: var(--adm-color-text);
   text-align: right;
+  line-height: 24px;
 }
 #Easy3wMFormPage .adm-list-item-content-prefix {
   width: auto;
@@ -34,3 +38,12 @@
 #Easy3wMFormPage .adm-stepper {
   width: 100%;
 }
+#Easy3wMFormPage .adm-stepper .adm-input-element {
+  border: none;
+}
+#Easy3wMFormPage .adm-text-area-element {
+  line-height: inherit;
+}
+#Easy3wMFormPage .adm-input {
+  --text-align: right;
+}

package/assets/mLogin.css

@@ -14,6 +14,7 @@
   height: 40px;
   border-radius: 4px;
   padding: 0 12px;
+  border: 1px solid #d9d9d9;
 }
 #Easy3wMLogin .errorMsgReal {
   background: #fff1f0;
@@ -45,3 +46,13 @@
   border-left: 0;
   background-color: transparent;
 }
+#Easy3wMLogin .funArea {
+  text-align: right;
+  margin-bottom: 24px;
+}
+#Easy3wMLogin .funArea > a {
+  padding-right: 12px;
+}
+#Easy3wMLogin .funArea > a:last-child {
+  padding-right: 0;
+}

package/assets/mSpin.css

@@ -1,15 +1,13 @@
 #Easy3wMSpin {
   position: fixed;
-  background: rgba(255, 255, 255, 0);
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  background: #fff;
+  top: 92px;
+  left: 49%;
+  margin-left: -69px;
   z-index: 9999;
-}
-#Easy3wMSpin .spinLoading {
-  position: relative;
-  left: 50%;
-  top: 50%;
-  --size: 48px;
+  text-align: center;
+  padding: 12px 24px;
+  color: var(--adm-color-primary);
+  border-radius: 2px;
+  box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
 }

package/assets/mTable.css

@@ -0,0 +1,71 @@
+#Easy3wMTable {
+  --padding: 6px;
+}
+#Easy3wMTable .queryCriteria .more {
+  padding: 0 12px;
+}
+#Easy3wMTable .queryCriteria .adm-button {
+  font-size: var(--adm-font-size-6);
+}
+#Easy3wMTable .queryCriteria .adm-list-item-content-extra {
+  font-size: var(--adm-font-size-6);
+  padding: 0;
+}
+#Easy3wMTable .queryCriteriaBtn {
+  margin-top: 24px;
+}
+#Easy3wMTable .singleItem .itemAttr {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: stretch;
+      align-items: stretch;
+  -ms-flex-pack: start;
+      justify-content: flex-start;
+  padding-bottom: var(--padding);
+}
+#Easy3wMTable .singleItem .itemAttr .attrLabel {
+  width: auto;
+  max-width: 70%;
+  -ms-flex: none;
+      flex: none;
+  padding-right: var(--padding);
+  color: var(--adm-color-weak);
+}
+#Easy3wMTable .singleItem .itemAttr .attrKey {
+  text-align: right;
+  -ms-flex: auto;
+      flex: auto;
+  color: var(--adm-color-text);
+}
+#Easy3wMTable .singleItem .itemAttr .attrKey.clickable {
+  color: var(--adm-color-primary);
+}
+#Easy3wMTable .singleItem .itemAttr:last-child {
+  padding-bottom: 0;
+}
+#Easy3wMTable .singleItem .itemAttr.clickable {
+  cursor: pointer;
+  color: var(--adm-color-primary);
+}
+#Easy3wMTable .singleItem .itemAttr.clickable .attrLabel {
+  color: var(--adm-color-primary);
+}
+#Easy3wMTable .singleItem .itemAttr.clickable .attrKey {
+  color: var(--adm-color-primary);
+}
+#Easy3wMTable .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;
+}
+#Easy3wMTable .easy3wMGridPageStepper .adm-button {
+  font-size: var(--adm-font-size-6);
+  padding-left: 24px;
+  padding-right: 24px;
+}

package/assets/mUserLayout.css

@@ -1,9 +1,15 @@
+#Easy3wMUserLayout {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: column;
+      flex-direction: column;
+  height: 100%;
+}
 #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;
+  -ms-flex-positive: 1;
+      flex-grow: 1;
 }

package/lib/Easy3wMDownLoad/index.js

@@ -190,7 +190,7 @@ var Easy3wMDownLoad = function (_Component) {
               'a',
               { onClick: function onClick() {
                   return _this2.onPreview(obj, url);
-                }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
+                }, style: { paddingRight: '12px' } },
               name
             ),
             _react2['default'].createElement(_antdMobileIcons.ArrowDownCircleOutline, { onClick: function onClick() {

package/lib/Easy3wMFormPage/index.js

@@ -138,6 +138,7 @@ var Easy3wMFormPage = function (_Component) {
     };
 
     _this.touchFormatData = function (item) {
+      var allReadFlag = _this.props.allReadFlag;
       var fieldType = item.fieldType,
           readFlag = item.readFlag,
           _item$childrenProps = item.childrenProps,
@@ -148,7 +149,7 @@ var Easy3wMFormPage = function (_Component) {
 
       if (value || value === false || value === 0) {
         // value值存在  Boolean()值为false的7个特殊值   undefined， null， false， NaN， ''， 0， -0
-        if (readFlag) {
+        if (readFlag || allReadFlag) {
           // 只读
           if (precision === 'year') {
             // 时间：年
@@ -237,11 +238,12 @@ var Easy3wMFormPage = function (_Component) {
           childrenProps = _item$childrenProps2 === undefined ? {} : _item$childrenProps2,
           label = item.label,
           options = item.options,
-          element = item.element;
+          element = item.element,
+          titleType = item.titleType;
 
       if (fieldType === 'input') {
         // 输入框
-        return _react2['default'].createElement(_input2['default'], (0, _extends3['default'])({ placeholder: '\u8BF7\u8F93\u5165' + label }, childrenProps));
+        return _react2['default'].createElement(_input2['default'], (0, _extends3['default'])({ placeholder: '\u8BF7\u8F93\u5165' + label, maxLength: titleType ? 400 : 100 }, childrenProps));
       } else if (fieldType === 'cascaderView') {
         // 都是单选，只有value
         return _react2['default'].createElement(_cascaderView2['default'], childrenProps);
@@ -428,7 +430,7 @@ var Easy3wMFormPage = function (_Component) {
       } else if (fieldType === 'switch') {
         return _react2['default'].createElement(_switch2['default'], childrenProps);
       } else if (fieldType === 'textArea') {
-        return _react2['default'].createElement(_textArea2['default'], (0, _extends3['default'])({ placeholder: '\u8BF7\u8F93\u5165' + label, showCount: true, maxLength: 50 }, childrenProps));
+        return _react2['default'].createElement(_textArea2['default'], (0, _extends3['default'])({ placeholder: '\u8BF7\u8F93\u5165' + label, showCount: true, maxLength: 2000 }, childrenProps));
       } else if (fieldType === 'else') {
         return element;
       }
@@ -473,7 +475,8 @@ var Easy3wMFormPage = function (_Component) {
         _props$hiddenItems = _props.hiddenItems,
         hiddenItems = _props$hiddenItems === undefined ? [] : _props$hiddenItems,
         requiredMessage = _props.requiredMessage,
-        form = _props.form;
+        form = _props.form,
+        allReadFlag = _props.allReadFlag;
     // fromProps 表单参数
     // itemProps 表单项参数
     // childrenProps 输入框参数
@@ -504,9 +507,11 @@ var Easy3wMFormPage = function (_Component) {
           if (fieldType === 'switch') {
             // 为Switch子元素添加额外的属性
             itemProps.getValueProps = _this2.getValuePropsSwitch;
+          } else if (fieldType === 'textArea') {
+            itemProps.layout = 'vertical';
           }
           value = _this2.touchFormatData(item);
-          if (readFlag) {
+          if (readFlag || allReadFlag) {
             return _react2['default'].createElement(
               Item,
               (0, _extends3['default'])({ label: label, name: fieldId + 'Easy3wView', required: required, initialValue: 'easy3wView', preserve: false }, cmptPros, { rules: addrules }),

package/lib/Easy3wMGlobalFooter/index.js

@@ -40,10 +40,9 @@ var Easy3wMGlobalFooter = function (_Component) {
         links = _props.links,
         copyright = _props.copyright;
 
-    var clsString = (0, _classnames2['default'])(className);
     return _react2['default'].createElement(
       'div',
-      { id: 'Easy3wMGlobalFooter', className: clsString },
+      { id: 'Easy3wMGlobalFooter', className: (0, _classnames2['default'])(className) },
       links && _react2['default'].createElement(
         'div',
         null,
@@ -53,7 +52,8 @@ var Easy3wMGlobalFooter = function (_Component) {
             {
               key: link.title,
               target: link.blankTarget ? '_blank' : '_self',
-              href: link.href
+              href: link.href,
+              rel: 'noreferrer'
             },
             link.title
           );

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,22 +153,44 @@ 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,
         submitting = _props.submitting,
-        errorMsg = _props.errorMsg;
-    var visible = this.state.visible;
+        errorMsg = _props.errorMsg,
+        objLoginMethod = _props.objLoginMethod;
+
+    var _ref = objLoginMethod || {},
+        account = _ref.account,
+        phone = _ref.phone;
 
     var errorMsgReal = errorMsg || '账户或密码错误';
     return _react2['default'].createElement(
@@ -126,22 +198,39 @@ var Easy3wMLogin = function (_Component) {
       { id: 'Easy3wMLogin' },
       _react2['default'].createElement(
         _tabs2['default'],
-        { activeKey: 'account', onChange: this.onChange },
-        _react2['default'].createElement(
+        { activeKey: activeKey, onChange: this.onChange },
+        account ? _react2['default'].createElement(
           Tab,
-          { title: '\u7528\u6237\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' },
@@ -190,7 +279,61 @@ 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(
+          Tab,
+          { title: '\u624B\u673A\u9A8C\u8BC1\u7801\u767B\u5F55', key: 'phone', destroyOnClose: true },
+          _react2['default'].createElement(
+            _form2['default'],
+            {
+              form: form,
+              layout: 'horizontal' // 字段与字段值排列方式
+              , name: 'phone',
+              onFinish: this.submitAccountLogin,
+              footer: // 表单尾部的内容，常常用来放置提交按钮
+              _react2['default'].createElement(
+                'div',
+                null,
+                _react2['default'].createElement(
+                  _button2['default'],
+                  { type: 'submit', color: 'primary', fill: 'solid', block: true },
+                  '\u767B\u5F55'
+                )
+              )
+            },
+            status === 'error' && submitting === false ? _react2['default'].createElement(
+              FormItem,
+              null,
+              _react2['default'].createElement(
+                'div',
+                { className: 'errorMsgReal' },
+                errorMsgReal
+              )
+            ) : '',
+            _react2['default'].createElement(
+              FormItem,
+              { 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: 'piccaptcha',
+                extra: count ? _react2['default'].createElement(
+                  _button2['default'],
+                  { 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\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 '';

package/lib/Easy3wMTable/index.js

@@ -0,0 +1,443 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _form = require('antd-mobile/es/components/form');
+
+var _form2 = _interopRequireDefault(_form);
+
+var _button = require('antd-mobile/es/components/button');
+
+var _button2 = _interopRequireDefault(_button);
+
+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 _antdMobile = require('antd-mobile');
+
+var _antdMobileIcons = require('antd-mobile-icons');
+
+var _easy3wmui = require('easy3wmui');
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+/* eslint-disable no-param-reassign */
+var Item = _easy3wmui.Easy3wMList.Item;
+
+var Easy3wMTable = function (_PureComponent) {
+  (0, _inherits3['default'])(Easy3wMTable, _PureComponent);
+
+  function Easy3wMTable(props) {
+    (0, _classCallCheck3['default'])(this, Easy3wMTable);
+
+    var _this = (0, _possibleConstructorReturn3['default'])(this, _PureComponent.call(this, props));
+
+    _this.formRef = function (form) {
+      if (_this.state.form) {
+        //
+      } else {
+        _this.setState({
+          form: form
+        });
+      }
+      return _react2['default'].createRef();
+    };
+
+    _this.touchFetch = function (callback) {
+      var handleSearch = _this.props.handleSearch;
+      var offset = _this.state.offset;
+
+      handleSearch(offset, _this.searchInfo, callback);
+    };
+
+    _this.touchChangePage = function (operationType) {
+      var offset = _this.state.offset;
+
+      if (operationType === 'minus') {
+        offset -= 1;
+      } else if (operationType === 'add') {
+        offset += 1;
+      }
+      _this.setState({
+        offset: offset // 当前页
+      }, _this.touchFetch);
+    };
+
+    _this.touchDropUpFlip = function () {
+      var flipContainer = document.querySelector('.flipContainer'); // 翻页主体
+      _this.flipContainerHeight = flipContainer.offsetHeight; // 元素高度
+      var flipText = document.querySelector('.flipText'); // 翻页提示文字
+      // 当手指放在触摸屏上时，发生此事件
+      flipContainer.addEventListener('touchstart', function (e) {
+        return _this.touchstart(e, flipContainer, flipText);
+      });
+      // 当手指在屏幕上拖动时，发生此事件
+      flipContainer.addEventListener('touchmove', function (e) {
+        return _this.touchmove(e, flipContainer, flipText);
+      });
+      // 当手指从触摸屏上移开时，发生此事件
+      flipContainer.addEventListener('touchend', function (e) {
+        return _this.touchend(e, flipContainer, flipText);
+      });
+    };
+
+    _this.touchstart = function (e, flipContainer, flipText) {
+      var offset = _this.state.offset;
+      var intData = _this.props.intData;
+
+      if (offset === Math.ceil(intData / 10)) {
+        flipText.innerText = '已经没有更多了！';
+      } else if (Math.round(flipContainer.getBoundingClientRect().bottom) === document.body.offsetHeight) {
+        _this.startPos = e.touches[0].pageY;
+        flipContainer.style.transition = 'transform 0s';
+        // this.setState({
+        //   startPos, // 起始位置
+        // });
+      }
+    };
+
+    _this.touchmove = function (e, flipContainer, flipText) {
+      if (Math.round(flipContainer.getBoundingClientRect().bottom) === document.body.offsetHeight && _this.startPos) {
+        _this.transitionHeight = e.touches[0].pageY - _this.startPos;
+        if (_this.transitionHeight < 0 && _this.transitionHeight > -48) {
+          flipText.innerText = '上拉翻页';
+          flipContainer.style.transform = 'translateY(' + _this.transitionHeight + 'px)';
+          if (_this.transitionHeight < 0 && _this.transitionHeight > -36) {
+            flipText.innerText = '释放更新';
+          }
+        }
+      } else {
+        _this.startPos = e.touches[0].pageY;
+      }
+    };
+
+    _this.touchend = function (e, flipContainer, flipText) {
+      if (_this.transitionHeight < 0 && _this.transitionHeight > -36) {
+        flipText.innerText = '更新中...';
+        var offset = _this.state.offset;
+
+        _this.setState({
+          offset: offset + 1
+        }, function () {
+          _this.touchFetch(function () {
+            flipContainer.style.transition = 'transform 0.5s ease 1s';
+            flipContainer.style.transform = 'translateY(0px)';
+            flipText.innerText = '';
+          });
+        });
+      } else {
+        flipContainer.style.transition = 'transform 0.5s ease 1s';
+        flipContainer.style.transform = 'translateY(0px)';
+        setTimeout(function () {
+          flipText.innerText = '';
+        }, 1500);
+      }
+      _this.startPos = null; // 起始位置
+      _this.transitionHeight = null; // 移动距离
+    };
+
+    _this.touchClearSV = function () {
+      _this.searchInfo.keywordsQry = ''; // 关键字
+      _this.setState({
+        offset: 1
+      }, function () {
+        return _this.touchFetch();
+      });
+    };
+
+    _this.touchChangeSV = function (keywordsQry) {
+      _this.searchInfo.keywordsQry = keywordsQry;
+    };
+
+    _this.touchSearch = function () {
+      _this.setState({
+        offset: 1
+      }, function () {
+        return _this.touchFetch();
+      });
+    };
+
+    _this.showModal = function () {
+      _this.setState({
+        visible: true // 显示更多筛选条件Modal
+      });
+    };
+
+    _this.hideModal = function () {
+      _this.setState({
+        visible: false // 隐藏更多筛选条件Modal
+      });
+    };
+
+    _this.touchConfirm = function () {
+      var values = _this.state.form.getFieldsValue();
+      var searchInfo = (0, _extends3['default'])({}, _this.searchInfo, values);
+      _this.searchInfo = searchInfo;
+      _this.touchFetch();
+      _this.hideModal();
+    };
+
+    var bidPureComponent = _this.props.bidPureComponent;
+
+    if (bidPureComponent && typeof bidPureComponent === 'function') {
+      bidPureComponent(_this);
+    }
+    _this.searchInfo = {}; // 查询条件
+    // 上拉翻页属性
+    _this.startPos = null; // 起始位置
+    _this.transitionHeight = null; // 移动距离
+    _this.state = {
+      offset: 1, // 分页
+      visible: false, // 隐藏更多筛选条件Modal
+      form: null // 表单实例
+    };
+    return _this;
+  }
+
+  Easy3wMTable.prototype.componentDidMount = function componentDidMount() {
+    var dropUpFlipFlag = this.props.dropUpFlipFlag;
+
+    if (dropUpFlipFlag) {
+      // 上拉翻页标识 true 开启 false 关闭
+      this.touchDropUpFlip();
+    }
+  };
+
+  Easy3wMTable.prototype.componentWillUnmount = function componentWillUnmount() {
+    var flipContainer = document.querySelector('.flipContainer'); // 翻页主体
+    if (flipContainer.removeEventListener) {
+      // 所有浏览器，除了 IE 8 及更早IE版本
+      // 当手指放在触摸屏上时，发生此事件
+      flipContainer.removeEventListener('touchstart', this.touchstart);
+      // 当手指在屏幕上拖动时，发生此事件
+      flipContainer.removeEventListener('touchmove', this.touchmove);
+      // 当手指从触摸屏上移开时，发生此事件
+      flipContainer.removeEventListener('touchend', this.touchend);
+    } else if (flipContainer.detachEvent) {
+      // IE 8 及更早IE版本
+      // 当手指放在触摸屏上时，发生此事件
+      flipContainer.detachEvent('touchstart', this.touchstart);
+      // 当手指在屏幕上拖动时，发生此事件
+      flipContainer.detachEvent('touchmove', this.touchmove);
+      // 当手指从触摸屏上移开时，发生此事件
+      flipContainer.detachEvent('touchend', this.touchend);
+    }
+  };
+  // 生成form实例
+
+  // 触发查询
+
+  // --------------------------------------------------- 上拉翻页 end ---------------------------------------------------
+  // 按钮翻页
+
+  // --------------------------------------------- 查询条件 start ---------------------------------------------
+  // --------------------------------------------------- 上拉翻页 start ---------------------------------------------------
+  // 上拉翻页
+
+  // 当手指放在触摸屏上时，发生此事件
+
+  // 当手指在屏幕上拖动时，发生此事件
+
+  // 当手指从触摸屏上移开时，发生此事件
+
+  // 清空查询条件
+
+  // 查询条件--流程名称修改
+
+  // 查询
+
+  // --------------------------------------------- 查询条件 end -----------------------------------------------
+  // --------------------------------------------- 更多筛选条件 start ---------------------------------------------
+  // 显示更多筛选条件Modal
+
+  // 隐藏更多筛选条件Modal
+
+  // 确定
+
+
+  // --------------------------------------------- 更多筛选条件 end -----------------------------------------------
+  Easy3wMTable.prototype.render = function render() {
+    var _this2 = this;
+
+    var _state = this.state,
+        offset = _state.offset,
+        visible = _state.visible;
+    var _props = this.props,
+        columns = _props.columns,
+        intData = _props.intData,
+        arrData = _props.arrData,
+        needPaginationFlag = _props.needPaginationFlag,
+        queryCriteria = _props.queryCriteria,
+        arrFilter = _props.arrFilter;
+    // columns 表头 arr    intData 数量 num    arrData 数据 arr    needPaginationFlag 分页标识 bool    handleSearch 查询方法 fun
+    // dropUpFlipFlag 上拉翻页标识 bool    bidPureComponent 将this传递出去 fun    queryCriteria 关键字 str
+
+    var arrBtn = [{
+      cName: '查询',
+      onClick: function onClick() {
+        return _this2.touchConfirm();
+      }
+    }, {
+      cName: '关闭',
+      onClick: function onClick() {
+        return _this2.hideModal();
+      }
+    }];
+    return _react2['default'].createElement(
+      'div',
+      { id: 'Easy3wMTable' },
+      _react2['default'].createElement(
+        'div',
+        { className: 'flipContainer' },
+        _react2['default'].createElement(
+          _easy3wmui.Easy3wMList,
+          null,
+          queryCriteria ? _react2['default'].createElement(Item, {
+            className: 'queryCriteria',
+            extra: arrFilter && arrFilter.length ? _react2['default'].createElement(
+              'div',
+              { className: 'more', onClick: this.showModal },
+              '\u66F4\u591A\u7B5B\u9009'
+            ) : '',
+            title: _react2['default'].createElement(_easy3wmui.Easy3wMSearchBar, {
+              onChange: function onChange(value) {
+                return _this2.touchChangeSV(value);
+              } // 输入框内容变化时触发
+              , onSearch: function onSearch() {
+                return _this2.touchSearch();
+              } // 输入框回车时触发
+              , onClear: function onClear() {
+                return _this2.touchClearSV('');
+              } // 点击清除按钮后触发
+              , placeholder: '\u8BF7\u8F93\u5165\u5173\u952E\u5B57\u67E5\u8BE2' // 提示文本
+              , clearOnCancel: false // 点击取消按钮后是否清空输入框
+              , showCancelButton: function showCancelButton() {
+                return true;
+              } // 是否在搜索框右侧显示取消按钮
+              , cancelText: '\u67E5\u8BE2' // 取消按钮的文案
+              , onCancel: function onCancel() {
+                return _this2.touchSearch();
+              } // 点击取消按钮时触发
+            })
+          }) : '',
+          arrData ? arrData.map(function (item, index) {
+            return _react2['default'].createElement(
+              Item,
+              null,
+              _react2['default'].createElement(
+                'div',
+                { className: 'singleItem' },
+                columns.map(function (obj) {
+                  var title = obj.title,
+                      dataIndex = obj.dataIndex,
+                      render = obj.render,
+                      onRow = obj.onRow,
+                      _onClick = obj.onClick;
+
+                  var value = item[dataIndex];
+                  if (render) {
+                    value = render(value, item, index);
+                  }
+                  return _react2['default'].createElement(
+                    'div',
+                    { className: 'itemAttr ' + (onRow ? 'clickable' : ''), onClick: function onClick() {
+                        return onRow(item[dataIndex], item, index);
+                      } },
+                    _react2['default'].createElement(
+                      'span',
+                      { className: 'attrLabel' },
+                      title
+                    ),
+                    _react2['default'].createElement(
+                      'span',
+                      { className: 'attrKey ' + (_onClick ? 'clickable' : ''), onClick: function onClick() {
+                          return _onClick(item[dataIndex], item, index);
+                        } },
+                      value
+                    )
+                  );
+                })
+              )
+            );
+          }) : ''
+        ),
+        needPaginationFlag ? _react2['default'].createElement(
+          _easy3wmui.Easy3wMCard,
+          null,
+          _react2['default'].createElement(
+            'div',
+            { className: 'easy3wMGridPageStepper' },
+            _react2['default'].createElement(
+              _button2['default'],
+              { color: 'default', fill: 'none', onClick: function onClick() {
+                  return _this2.touchChangePage('minus');
+                }, disabled: offset === 1 },
+              _react2['default'].createElement(_antdMobileIcons.LeftOutline, null)
+            ),
+            _react2['default'].createElement(
+              'span',
+              null,
+              offset,
+              '/',
+              Math.ceil(intData / 10),
+              '  \u5171',
+              intData,
+              '\u6761'
+            ),
+            _react2['default'].createElement(
+              _button2['default'],
+              { color: 'default', fill: 'none', onClick: function onClick() {
+                  return _this2.touchChangePage('add');
+                }, disabled: offset === Math.ceil(intData / 10) },
+              _react2['default'].createElement(_antdMobileIcons.RightOutline, null)
+            )
+          )
+        ) : '',
+        _react2['default'].createElement(
+          _easy3wmui.Easy3wMPopup,
+          {
+            visible: visible,
+            onClose: this.hideModal,
+            position: 'top'
+            // showCloseButton
+            , bodyStyle: { height: '100vh', overflow: 'auto' },
+            getContainer: document.querySelector('.flipContainer')
+          },
+          _react2['default'].createElement(_form2['default'], { ref: this.formRef }),
+          this.state.form ? _react2['default'].createElement(_easy3wmui.Easy3wMFormPage, {
+            rowItems: arrFilter,
+            form: this.state.form
+          }) : '',
+          _react2['default'].createElement(
+            'div',
+            { className: 'queryCriteriaBtn' },
+            _react2['default'].createElement(_easy3wmui.Easy3wMButton, { arrBtn: arrBtn })
+          )
+        )
+      ),
+      _react2['default'].createElement('div', { className: 'flipText', style: { textAlign: 'center' } })
+    );
+  };
+
+  return Easy3wMTable;
+}(_react.PureComponent);
+
+exports['default'] = Easy3wMTable;
+module.exports = exports['default'];

package/lib/Easy3wMUserLayout/index.less

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

package/lib/index.js

@@ -713,6 +713,15 @@ Object.defineProperty(exports, 'Easy3wMGridPage', {
   }
 });
 
+var _Easy3wMTable = require('./Easy3wMTable');
+
+Object.defineProperty(exports, 'Easy3wMTable', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wMTable)['default'];
+  }
+});
+
 var _Easy3wMGlobalHeader = require('./Easy3wMGlobalHeader');
 
 Object.defineProperty(exports, 'Easy3wMGlobalHeader', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wmui",
-  "version": "0.0.42-beta3",
+  "version": "0.0.42-beta30",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",
@@ -103,7 +103,7 @@
   ],
   "dependencies": {
     "@hanyk/rc-viewer": "^0.0.3",
-    "antd-mobile": "5.21.0",
+    "antd-mobile": "5.34.0",
     "braft-editor": "^2.3.8",
     "lodash": "4.17.11",
     "node-red": "^2.1.4",