easy3wmui 0.0.18 → 0.0.19

package/lib/Easy3wMFormPage/index.js

@@ -188,7 +188,7 @@ var Easy3wMFormPage = function (_Component) {
 				return value;
 			} else {
 				// value值不存在
-				return '';
+				return value;
 			}
 		};
 
@@ -224,6 +224,12 @@ var Easy3wMFormPage = function (_Component) {
 			form.setFieldsValue((_form$setFieldsValue4 = {}, _form$setFieldsValue4[fieldId] = value, _form$setFieldsValue4));
 		};
 
+		_this.getValuePropsSwitch = function (value) {
+			return {
+				checked: value
+			};
+		};
+
 		_this.renderItemChildren = function (item) {
 			var fieldId = item.fieldId,
 			    fieldType = item.fieldType,
@@ -368,8 +374,10 @@ var Easy3wMFormPage = function (_Component) {
 					}
 				);
 			} else if (fieldType === 'datePickerView') {
+				// 时间无值的时候不能用空字符串 可以用null或undefined
 				return _react2['default'].createElement(_datePickerView2['default'], childrenProps);
 			} else if (fieldType === 'datePicker') {
+				// 时间无值的时候不能用空字符串 可以用null或undefined
 				return _react2['default'].createElement(
 					_datePicker2['default'],
 					(0, _extends3['default'])({
@@ -418,7 +426,7 @@ var Easy3wMFormPage = function (_Component) {
 			} else if (fieldType === 'stepper') {
 				return _react2['default'].createElement(_stepper2['default'], childrenProps);
 			} else if (fieldType === 'switch') {
-				return _react2['default'].createElement(_switch2['default'], (0, _extends3['default'])({ defaultChecked: item.value }, childrenProps));
+				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));
 			} else if (fieldType === 'else') {
@@ -449,6 +457,8 @@ var Easy3wMFormPage = function (_Component) {
 	// 确认时触发
 
 	// ------------------------------------- DatePicker end --------------------------------------------------------
+	// 为Switch子元素添加额外的属性
+
 	// 渲染item的子内容
 
 
@@ -479,15 +489,21 @@ var Easy3wMFormPage = function (_Component) {
 				    required = item.required,
 				    readFlag = item.readFlag,
 				    disableFlag = item.disableFlag,
-				    cmptPros = item.cmptPros;
+				    cmptPros = item.cmptPros,
+				    fieldType = item.fieldType;
 				var value = item.value;
 
+				var itemProps = {}; // Form.Item的属性
 				var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
 				if (cmptPros && cmptPros.rules) {
 					var rules = cmptPros.rules;
 
 					addrules.push.apply(addrules, rules);
 				}
+				if (fieldType === 'switch') {
+					// 为Switch子元素添加额外的属性
+					itemProps.getValueProps = _this2.getValuePropsSwitch;
+				}
 				value = _this2.touchFormatData(item);
 				if (readFlag) {
 					return _react2['default'].createElement(
@@ -498,7 +514,15 @@ var Easy3wMFormPage = function (_Component) {
 				} else {
 					return _react2['default'].createElement(
 						Item,
-						(0, _extends3['default'])({ label: label, name: fieldId, required: required, initialValue: value, disabled: disableFlag }, cmptPros, { rules: addrules }),
+						(0, _extends3['default'])({
+							label: label,
+							name: fieldId,
+							required: required,
+							initialValue: value,
+							disabled: disableFlag
+						}, itemProps, cmptPros, {
+							rules: addrules
+						}),
 						_this2.renderItemChildren(item)
 					);
 				}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wmui",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",