easy3wmui 0.0.42-beta2 → 0.0.42-beta20

package/assets/index.css

@@ -23,9 +23,6 @@
 :root:root .adm-input {
   --font-size: var(--adm-font-size-4);
 }
-:root:root .adm-input-element {
-  border: 1px solid #d9d9d9;
-}
 :root:root .adm-input-element:focus,
 :root:root .adm-input-element:hover {
   border-color: var(--adm-color-primary);
@@ -33,9 +30,6 @@
 :root:root .adm-text-area {
   --font-size: var(--adm-font-size-4);
 }
-:root:root .adm-text-area-element {
-  border: 1px solid #d9d9d9;
-}
 :root:root .adm-text-area-element:focus,
 :root:root .adm-text-area-element:hover {
   border-color: var(--adm-color-primary);
@@ -79,6 +73,8 @@
   -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;
@@ -138,6 +134,11 @@
 #Easy3wMGlobalFooter {
   text-align: center;
 }
+#Easy3wMGlobalFooter.bottomFixed {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
 #Easy3wMInsideLayout {
   overflow: hidden;
 }
@@ -171,18 +172,16 @@
 }
 #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);
 }
 #Easy3wMUserLayout .Easy3wMUserLayoutContent {
   background-color: #f0f2f5;
@@ -191,7 +190,6 @@
   background-repeat: no-repeat;
   background-position: center;
   background-size: 100%;
-  padding: 40px 0 0 0;
 }
 #Easy3wMCard .adm-card {
   padding: 0;
@@ -217,9 +215,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;
@@ -233,15 +235,28 @@
   -ms-flex: none;
       flex: none;
 }
+#Easy3wMFormPage .adm-picker-view-mask {
+  z-index: 1;
+}
+#Easy3wMFormPage .adm-stepper {
+  width: 100%;
+}
+#Easy3wMFormPage .adm-stepper .adm-input-element {
+  border: none;
+}
+#Easy3wMFormPage .adm-text-area-element {
+  line-height: inherit;
+}
 #Easy3wMGridPage .easy3wMGridPageStepper {
   display: -ms-flexbox;
   display: flex;
-  -ms-flex-direction: column;
-      flex-direction: column;
-  -ms-flex-align: end;
-      align-items: flex-end;
-  padding: 0 12px;
-  line-height: 28px;
+  -ms-flex-direction: row;
+      flex-direction: row;
+  -ms-flex-pack: justify;
+      justify-content: space-between;
+  -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;
@@ -297,6 +312,7 @@
   height: 40px;
   border-radius: 4px;
   padding: 0 12px;
+  border: 1px solid #d9d9d9;
 }
 #Easy3wMLogin .errorMsgReal {
   background: #fff1f0;
@@ -328,3 +344,7 @@
   border-left: 0;
   background-color: transparent;
 }
+#Easy3wMLogin .forgotPassword {
+  text-align: right;
+  margin-bottom: 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;
@@ -28,3 +32,15 @@
   -ms-flex: none;
       flex: none;
 }
+#Easy3wMFormPage .adm-picker-view-mask {
+  z-index: 1;
+}
+#Easy3wMFormPage .adm-stepper {
+  width: 100%;
+}
+#Easy3wMFormPage .adm-stepper .adm-input-element {
+  border: none;
+}
+#Easy3wMFormPage .adm-text-area-element {
+  line-height: inherit;
+}

package/assets/mGlobalFooter.css

@@ -1,3 +1,8 @@
 #Easy3wMGlobalFooter {
   text-align: center;
 }
+#Easy3wMGlobalFooter.bottomFixed {
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}

package/assets/mGridPage.css

@@ -1,12 +1,13 @@
 #Easy3wMGridPage .easy3wMGridPageStepper {
   display: -ms-flexbox;
   display: flex;
-  -ms-flex-direction: column;
-      flex-direction: column;
-  -ms-flex-align: end;
-      align-items: flex-end;
-  padding: 0 12px;
-  line-height: 28px;
+  -ms-flex-direction: row;
+      flex-direction: row;
+  -ms-flex-pack: justify;
+      justify-content: space-between;
+  -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/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,7 @@
   border-left: 0;
   background-color: transparent;
 }
+#Easy3wMLogin .forgotPassword {
+  text-align: right;
+  margin-bottom: 24px;
+}

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/mUserLayout.css

@@ -5,5 +5,4 @@
   background-repeat: no-repeat;
   background-position: center;
   background-size: 100%;
-  padding: 40px 0 0 0;
 }

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/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() {