easy3wmui 0.0.18 → 0.0.21

package/lib/Easy3wMDownLoad/Easy3wMFileView.js

@@ -50,17 +50,14 @@ var Easy3wMFileView = function (_PureComponent) {
         fileName = _props.fileName;
 
     var actions = [{ onClick: this.cancelHandler, text: '关闭' }];
-    return _react2['default'].createElement(
-      _Easy3wMModal2['default'],
-      {
-        title: fileName,
-        visible: visible,
-        onClose: this.cancelHandler,
-        width: '100%',
-        actions: actions,
-        destroyOnClose: true
-      },
-      _react2['default'].createElement(
+    return _react2['default'].createElement(_Easy3wMModal2['default'], {
+      title: fileName,
+      visible: visible,
+      onClose: this.cancelHandler,
+      width: '100%',
+      actions: actions,
+      destroyOnClose: true,
+      content: _react2['default'].createElement(
         'div',
         null,
         _react2['default'].createElement('iframe', {
@@ -74,7 +71,7 @@ var Easy3wMFileView = function (_PureComponent) {
           scrolling: 'yes'
         })
       )
-    );
+    });
   };
 
   return Easy3wMFileView;

package/lib/Easy3wMDownLoad/Easy3wMImgView.js

@@ -18,14 +18,14 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _Easy3wMModal = require('../Easy3wMModal');
-
-var _Easy3wMModal2 = _interopRequireDefault(_Easy3wMModal);
-
 var _reactImages = require('react-images');
 
 var _reactImages2 = _interopRequireDefault(_reactImages);
 
+var _Easy3wMModal = require('../Easy3wMModal');
+
+var _Easy3wMModal2 = _interopRequireDefault(_Easy3wMModal);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var Easy3wMImgView = function (_PureComponent) {
@@ -54,18 +54,15 @@ var Easy3wMImgView = function (_PureComponent) {
         fileName = _props.fileName;
 
     var actions = [{ onClick: this.cancelHandler, text: '关闭' }];
-    return _react2['default'].createElement(
-      _Easy3wMModal2['default'],
-      {
-        title: fileName,
-        visible: visible,
-        onClose: this.cancelHandler,
-        width: '100%',
-        actions: actions,
-        destroyOnClose: true
-      },
-      _react2['default'].createElement(_reactImages2['default'], { views: [{ src: fileURL }] })
-    );
+    return _react2['default'].createElement(_Easy3wMModal2['default'], {
+      title: fileName,
+      visible: visible,
+      onClose: this.cancelHandler,
+      width: '100%',
+      actions: actions,
+      destroyOnClose: true,
+      content: _react2['default'].createElement(_reactImages2['default'], { views: [{ src: fileURL }] })
+    });
   };
 
   return Easy3wMImgView;

package/lib/Easy3wMDownLoad/Easy3wMPDFView.js

@@ -22,14 +22,14 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _Easy3wMModal = require('../Easy3wMModal');
-
-var _Easy3wMModal2 = _interopRequireDefault(_Easy3wMModal);
-
 var _reactPdf = require('react-pdf');
 
 var _antdMobile = require('antd-mobile');
 
+var _Easy3wMModal = require('../Easy3wMModal');
+
+var _Easy3wMModal2 = _interopRequireDefault(_Easy3wMModal);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
 var Easy3wMPDFView = function (_PureComponent) {
@@ -101,17 +101,14 @@ var Easy3wMPDFView = function (_PureComponent) {
         numPages = _state.numPages;
 
     var actions = [{ onClick: this.previousPage, text: '上一页' }, { onClick: this.nextPage, text: '下一页' }, { onClick: this.cancelHandler, text: '关闭' }];
-    return _react2['default'].createElement(
-      _Easy3wMModal2['default'],
-      {
-        title: fileName,
-        visible: visible,
-        onClose: this.cancelHandler,
-        width: '100%',
-        actions: actions,
-        destroyOnClose: true
-      },
-      _react2['default'].createElement(
+    return _react2['default'].createElement(_Easy3wMModal2['default'], {
+      title: fileName,
+      visible: visible,
+      onClose: this.cancelHandler,
+      width: '100%',
+      actions: actions,
+      destroyOnClose: true,
+      content: _react2['default'].createElement(
         'div',
         null,
         _react2['default'].createElement(
@@ -139,7 +136,7 @@ var Easy3wMPDFView = function (_PureComponent) {
           )
         )
       )
-    );
+    });
   };
 
   return Easy3wMPDFView;

package/lib/Easy3wMDownLoad/index.js

@@ -30,6 +30,14 @@ var _antdMobileIcons = require('antd-mobile-icons');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
+var _Easy3wMPDFView = require('./Easy3wMPDFView');
+
+var _Easy3wMPDFView2 = _interopRequireDefault(_Easy3wMPDFView);
+
+var _Easy3wMFileView = require('./Easy3wMFileView');
+
+var _Easy3wMFileView2 = _interopRequireDefault(_Easy3wMFileView);
+
 var _Easy3wMRCView = require('./Easy3wMRCView');
 
 var _Easy3wMRCView2 = _interopRequireDefault(_Easy3wMRCView);
@@ -48,9 +56,6 @@ var _ref = _comonConfig.objPreviewFile || {},
     previewFileUrl = _ref.previewFileUrl,
     previewFileFlag = _ref.previewFileFlag,
     previewFileType = _ref.previewFileType;
-// import Easy3wMPDFView from './Easy3wMPDFView';
-// import Easy3wMFileView from './Easy3wMFileView';
-
 
 var Easy3wMDownLoad = function (_Component) {
   (0, _inherits3['default'])(Easy3wMDownLoad, _Component);
@@ -125,7 +130,6 @@ var Easy3wMDownLoad = function (_Component) {
     };
 
     _this.showPdfView = function (uid, url, name) {
-      console.log('uid, url, name', uid, url, name);
       _this.setState({ pdfViewFlag: true, fileId: uid, fileURL: url, fileName: name });
     };
 
@@ -193,31 +197,30 @@ var Easy3wMDownLoad = function (_Component) {
                 return _this2.touchDownload(obj, url);
               }, style: { float: 'right', lineHeight: '100%' } })
           );
-          /**
-           else if (previwPdfFlag && fileType.indexOf('pdf') >= 0) {
-                return (
-                  <div>
-                    <a onClick={() => this.showPdfView(uid, url, name)}>
-                      {name}
-                    </a>
-                  </div>
-                );
-              } else if (fileType && fileViewFlag && (
-                fileType.indexOf('doc') >= 0
-                  || fileType.indexOf('docx') >= 0
-                  || fileType.indexOf('xls') >= 0
-                  || fileType.indexOf('xlsx') >= 0
-                  || fileType.indexOf('txt') >= 0
-              )) {
-                return (
-                  <div>
-                    <a onClick={() => this.showFileView(uid, name, apiKey, fileViewURL, fileCallURL)}>
-                      {name}
-                    </a>
-                  </div>
-                );
-              }
-           */
+        } else if (previwPdfFlag && fileType.indexOf('pdf') >= 0) {
+          return _react2['default'].createElement(
+            'div',
+            null,
+            _react2['default'].createElement(
+              'a',
+              { onClick: function onClick() {
+                  return _this2.showPdfView(uid, url, name);
+                } },
+              name
+            )
+          );
+        } else if (fileType && fileViewFlag && (fileType.indexOf('doc') >= 0 || fileType.indexOf('docx') >= 0 || fileType.indexOf('xls') >= 0 || fileType.indexOf('xlsx') >= 0 || fileType.indexOf('txt') >= 0)) {
+          return _react2['default'].createElement(
+            'div',
+            null,
+            _react2['default'].createElement(
+              'a',
+              { onClick: function onClick() {
+                  return _this2.showFileView(uid, name, apiKey, fileViewURL, fileCallURL);
+                } },
+              name
+            )
+          );
         } else if (fileType && (fileType.indexOf('png') >= 0 || fileType.indexOf('jpg') >= 0 || fileType.indexOf('jpeg') >= 0)) {
           return _react2['default'].createElement(
             'div',
@@ -243,30 +246,28 @@ var Easy3wMDownLoad = function (_Component) {
         }
       });
     }
-    // const viewPDFObj = (
-    //   <Easy3wMPDFView
-    //     fileId={this.state.fileId}
-    //     fileName={this.state.fileName}
-    //     fileURL={this.state.fileURL}
-    //     visible={this.state.pdfViewFlag}
-    //     hideModal={this.hidePDFModal}
-    //   />
-    // );
-    // const viewFileObj = (
-    //   <Easy3wMFileView
-    //     fileId={this.state.fileId}
-    //     fileName={this.state.fileName}
-    //     fileURL={this.state.fileURL}
-    //     visible={this.state.fileViewFlag}
-    //     hideModal={this.hideFileModal}
-    //     viewFileUrl={this.state.viewFileUrl}
-    //   />
-    // );
+    var viewPDFObj = _react2['default'].createElement(_Easy3wMPDFView2['default'], {
+      fileId: this.state.fileId,
+      fileName: this.state.fileName,
+      fileURL: this.state.fileURL,
+      visible: this.state.pdfViewFlag,
+      hideModal: this.hidePDFModal
+    });
+    var viewFileObj = _react2['default'].createElement(_Easy3wMFileView2['default'], {
+      fileId: this.state.fileId,
+      fileName: this.state.fileName,
+      fileURL: this.state.fileURL,
+      visible: this.state.fileViewFlag,
+      hideModal: this.hideFileModal,
+      viewFileUrl: this.state.viewFileUrl
+    });
     var viewImgObj = _react2['default'].createElement(_Easy3wMRCView2['default'], { imgUrl: this.state.imageViewURL, hideModal: this.hideImageView });
     return _react2['default'].createElement(
       'div',
       null,
       retObj,
+      viewPDFObj,
+      viewFileObj,
       viewImgObj
     );
   };

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的子内容
 
 
@@ -470,45 +480,78 @@ var Easy3wMFormPage = function (_Component) {
 		// rowItems 显示字段
 		// hiddenItems 隐藏字段
 
-		return _react2['default'].createElement(
-			_form2['default'],
-			(0, _extends3['default'])({ id: 'Easy3wMFormPage', layout: 'horizontal', form: form }, formProps),
-			rowItems.map(function (item) {
-				var label = item.label,
-				    fieldId = item.fieldId,
-				    required = item.required,
-				    readFlag = item.readFlag,
-				    disableFlag = item.disableFlag,
-				    cmptPros = item.cmptPros;
-				var value = item.value;
-
-				var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
-				if (cmptPros && cmptPros.rules) {
-					var rules = cmptPros.rules;
-
-					addrules.push.apply(addrules, rules);
-				}
-				value = _this2.touchFormatData(item);
-				if (readFlag) {
-					return _react2['default'].createElement(
-						Item,
-						(0, _extends3['default'])({ label: label, name: fieldId + 'Easy3wView', required: required, initialValue: 'easy3wView' }, cmptPros, { rules: addrules }),
-						value
-					);
-				} else {
-					return _react2['default'].createElement(
-						Item,
-						(0, _extends3['default'])({ label: label, name: fieldId, required: required, initialValue: value, disabled: disableFlag }, cmptPros, { rules: addrules }),
-						_this2.renderItemChildren(item)
-					);
-				}
-			}),
-			hiddenItems.map(function (item) {
-				var fieldId = item.fieldId,
-				    value = item.value;
+		return (// value发生改变时，form的值就会发生改变
+			_react2['default'].createElement(
+				_form2['default'],
+				(0, _extends3['default'])({ id: 'Easy3wMFormPage', layout: 'horizontal', form: form }, formProps),
+				rowItems.map(function (item) {
+					var label = item.label,
+					    fieldId = item.fieldId,
+					    required = item.required,
+					    readFlag = item.readFlag,
+					    disableFlag = item.disableFlag,
+					    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(
+							Item,
+							(0, _extends3['default'])({ label: label, name: fieldId + 'Easy3wView', required: required, initialValue: 'easy3wView' }, cmptPros, { rules: addrules }),
+							value
+						);
+					} else {
+						if (value !== _this2.props.form.getFieldValue(fieldId)) {
+							if (value || value === false || value === 0) {
+								var _this2$props$form$set;
+
+								// value值存在  Boolean()值为false的7个特殊值   undefined， null， false， NaN， ''， 0， -0
+								_this2.props.form.setFieldsValue((_this2$props$form$set = {}, _this2$props$form$set[fieldId] = value, _this2$props$form$set));
+							} else {
+								var _this2$props$form$set2;
+
+								_this2.props.form.setFieldsValue((_this2$props$form$set2 = {}, _this2$props$form$set2[fieldId] = fieldType === 'input' || fieldType === 'textArea' ? '' : null, _this2$props$form$set2));
+							}
+						}
+						return _react2['default'].createElement(
+							Item,
+							(0, _extends3['default'])({
+								label: label,
+								name: fieldId,
+								required: required,
+								initialValue: value,
+								disabled: disableFlag
+							}, itemProps, cmptPros, {
+								rules: addrules
+							}),
+							_this2.renderItemChildren(item)
+						);
+					}
+				}),
+				hiddenItems.map(function (item) {
+					var fieldId = item.fieldId,
+					    value = item.value;
 
-				return _react2['default'].createElement(Item, { name: fieldId, initialValue: value, hidden: true });
-			})
+					if (value !== _this2.props.form.getFieldValue(fieldId)) {
+						var _this2$props$form$set3;
+
+						_this2.props.form.setFieldsValue((_this2$props$form$set3 = {}, _this2$props$form$set3[fieldId] = value, _this2$props$form$set3));
+					}
+					return _react2['default'].createElement(Item, { name: fieldId, initialValue: value, hidden: true });
+				})
+			)
 		);
 	};
 

package/package.json

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