easy3wui 2.0.10 → 2.0.13

package/assets/index.css

@@ -1452,6 +1452,9 @@ s {
 .e3wResult .e3wResultActions e3wResultButton:not(:last-child) {
   margin-right: 8px;
 }
+#Easy3wMButton {
+  background: #fff;
+}
 #Easy3wMButton :global .adm-space-item {
   -ms-flex-positive: 1;
       flex-grow: 1;
@@ -1514,3 +1517,6 @@ s {
   background-size: 100%;
   padding: 40px 0 0 0;
 }
+#Easy3wMCard .adm-card-header-title {
+  --adm-font-size-7: 14;
+}

package/assets/mButton.css

@@ -1,3 +1,6 @@
+#Easy3wMButton {
+  background: #fff;
+}
 #Easy3wMButton :global .adm-space-item {
   -ms-flex-positive: 1;
       flex-grow: 1;

package/assets/mCard.css

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

package/lib/Easy3wMButton/index.js

@@ -95,52 +95,44 @@ var Easy3wMButton = function (_Component) {
       'div',
       { id: 'Easy3wMButton' },
       _react2['default'].createElement(
-        _Easy3wMCard2['default'],
-        null,
-        _react2['default'].createElement(
-          _Easy3wMSpace2['default'],
-          { justify: 'end', block: true },
-          arrBtn.map(function (item) {
-            var cName = item.cName,
-                confirmContent = item.confirmContent,
-                _onClick = item.onClick,
-                popoverMenuProps = item.popoverMenuProps;
-
-            if (popoverMenuProps) {
-              // 二级按钮列表, item中不能有onClick
-              var _onAction = popoverMenuProps.onAction;
-
-              return _react2['default'].createElement(
-                _Easy3wMPopoverMenu2['default'],
-                (0, _extends3['default'])({ mode: 'dark', placement: 'top', trigger: 'click' }, popoverMenuProps, { onAction: function onAction(e) {
-                    return _this2.onClickFunc(e, _onAction);
-                  } }),
-                _react2['default'].createElement(
-                  _antdMobile.Button,
-                  (0, _extends3['default'])({ color: 'primary', shape: 'rectangular', block: true, fill: 'solid' }, item),
-                  cName
-                )
-              );
-            } else if (confirmContent) {
-              // 二次确认
-              return _react2['default'].createElement(
+        _Easy3wMSpace2['default'],
+        { justify: 'end', block: true },
+        arrBtn.map(function (item) {
+          var cName = item.cName,
+              confirmContent = item.confirmContent,
+              _onClick = item.onClick,
+              popoverMenuProps = item.popoverMenuProps;
+
+          if (popoverMenuProps) {
+            // 二级按钮列表, item中不能有onClick
+            return _react2['default'].createElement(
+              _Easy3wMPopoverMenu2['default'],
+              (0, _extends3['default'])({ mode: 'dark', placement: 'top', trigger: 'click' }, popoverMenuProps),
+              _react2['default'].createElement(
                 _antdMobile.Button,
-                (0, _extends3['default'])({ color: 'primary', shape: 'rectangular', block: true, fill: 'solid' }, item, { onClick: function onClick(e) {
-                    return _this2.onConfirm(e, item);
-                  } }),
+                (0, _extends3['default'])({ color: 'primary', shape: 'rectangular', block: true, fill: 'solid' }, item),
                 cName
-              );
-            } else {
-              return _react2['default'].createElement(
-                _antdMobile.Button,
-                (0, _extends3['default'])({ color: 'primary', shape: 'rectangular', block: true, fill: 'solid' }, item, { onClick: function onClick(e) {
-                    return _this2.onClickFunc(e, _onClick);
-                  } }),
-                cName
-              );
-            }
-          })
-        )
+              )
+            );
+          } else if (confirmContent) {
+            // 二次确认
+            return _react2['default'].createElement(
+              _antdMobile.Button,
+              (0, _extends3['default'])({ color: 'primary', shape: 'rectangular', block: true, fill: 'solid' }, item, { onClick: function onClick(e) {
+                  return _this2.onConfirm(e, item);
+                } }),
+              cName
+            );
+          } else {
+            return _react2['default'].createElement(
+              _antdMobile.Button,
+              (0, _extends3['default'])({ color: 'primary', shape: 'rectangular', block: true, fill: 'solid' }, item, { onClick: function onClick(e) {
+                  return _this2.onClickFunc(e, _onClick);
+                } }),
+              cName
+            );
+          }
+        })
       )
     );
   };

package/lib/Easy3wMCard/index.js

@@ -34,9 +34,13 @@ var Easy3wMCard = function (_Component) {
     var children = this.props.children;
 
     return _react2['default'].createElement(
-      _antdMobile.Card,
-      this.props,
-      children
+      'div',
+      { id: 'Easy3wMCard' },
+      _react2['default'].createElement(
+        _antdMobile.Card,
+        this.props,
+        children
+      )
     );
   };
 

package/lib/Easy3wMCard/index.less

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

package/lib/Easy3wMFormPage/index.js

@@ -28,11 +28,11 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 
 var Item = _antdMobile.Form.Item;
 
-var Easy3wMGridPage = function (_Component) {
-	(0, _inherits3['default'])(Easy3wMGridPage, _Component);
+var Easy3wMFormPage = function (_Component) {
+	(0, _inherits3['default'])(Easy3wMFormPage, _Component);
 
-	function Easy3wMGridPage(props) {
-		(0, _classCallCheck3['default'])(this, Easy3wMGridPage);
+	function Easy3wMFormPage(props) {
+		(0, _classCallCheck3['default'])(this, Easy3wMFormPage);
 
 		var _this = (0, _possibleConstructorReturn3['default'])(this, _Component.call(this, props));
 
@@ -40,7 +40,8 @@ var Easy3wMGridPage = function (_Component) {
 			var fieldType = item.fieldType,
 			    childrenProps = item.childrenProps,
 			    label = item.label,
-			    options = item.options;
+			    options = item.options,
+			    element = item.element;
 
 			if (fieldType === 'input') {
 				return _react2['default'].createElement(_antdMobile.Input, (0, _extends3['default'])({ placeholder: '\u8BF7\u8F93\u5165' + label }, childrenProps));
@@ -114,6 +115,8 @@ var Easy3wMGridPage = function (_Component) {
 				return _react2['default'].createElement(_antdMobile.Switch, childrenProps);
 			} else if (fieldType === 'textArea') {
 				return _react2['default'].createElement(_antdMobile.TextArea, childrenProps);
+			} else if (fieldType === 'else') {
+				return element;
 			}
 		};
 
@@ -121,11 +124,11 @@ var Easy3wMGridPage = function (_Component) {
 		return _this;
 	}
 
-	Easy3wMGridPage.prototype.componentWillUnmount = function componentWillUnmount() {};
+	Easy3wMFormPage.prototype.componentWillUnmount = function componentWillUnmount() {};
 	// 渲染item的子内容
 
 
-	Easy3wMGridPage.prototype.render = function render() {
+	Easy3wMFormPage.prototype.render = function render() {
 		var _this2 = this;
 
 		var _props = this.props,
@@ -133,8 +136,8 @@ var Easy3wMGridPage = function (_Component) {
 		    formProps = _props$formProps === undefined ? {} : _props$formProps,
 		    _props$rowItems = _props.rowItems,
 		    rowItems = _props$rowItems === undefined ? [] : _props$rowItems,
-		    hiddenItems = _props.hiddenItems,
-		    allReadFlag = _props.allReadFlag,
+		    _props$hiddenItems = _props.hiddenItems,
+		    hiddenItems = _props$hiddenItems === undefined ? [] : _props$hiddenItems,
 		    requiredMessage = _props.requiredMessage,
 		    form = _props.form;
 		// fromProps 表单参数
@@ -145,7 +148,7 @@ var Easy3wMGridPage = function (_Component) {
 
 		return _react2['default'].createElement(
 			_antdMobile.Form,
-			(0, _extends3['default'])({ layout: 'horizontal', allReadFlag: allReadFlag, form: form }, formProps),
+			(0, _extends3['default'])({ layout: 'horizontal', form: form }, formProps),
 			rowItems.map(function (item) {
 				var label = item.label,
 				    fieldId = item.fieldId,
@@ -184,8 +187,8 @@ var Easy3wMGridPage = function (_Component) {
 		);
 	};
 
-	return Easy3wMGridPage;
+	return Easy3wMFormPage;
 }(_react.Component);
 
-exports['default'] = Easy3wMGridPage;
+exports['default'] = Easy3wMFormPage;
 module.exports = exports['default'];

package/lib/Easy3wMSpin/index.js

@@ -28,12 +28,10 @@ var _propTypes2 = _interopRequireDefault(_propTypes);
 
 var _antdMobile = require('antd-mobile');
 
-var _index = require('./index.less');
-
-var _index2 = _interopRequireDefault(_index);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+// import Easy3wMSpinStyle from './index.less';
+
 var Easy3wMSpin = function (_Component) {
   (0, _inherits3['default'])(Easy3wMSpin, _Component);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "2.0.10",
+  "version": "2.0.13",
   "description": "easy3wui components for react",
   "keywords": [
     "react",