easy3wui 1.4.220 → 1.4.224

package/lib/Easy3wFormPage/index.js

@@ -388,14 +388,19 @@ var Easy3wFormPage = function (_Component) {
 
           if (treeData && treeData.length > 0) {
             if (typeof value === 'object') {
-              // 对象
-              value = value.label;
-              // 数组
-              if (value instanceof _propTypes.array) {
-                var arrVal = value.map(function (itemVal) {
+              if (!value) {
+                value = undefined;
+              } else if (!value.key && !value.value) {
+                value = undefined;
+              } else if (value instanceof Array) {
+                // 数组
+                var arrVal = value && value.map(function (itemVal) {
                   return itemVal.label;
                 });
                 value = arrVal.join();
+              } else {
+                // 对象
+                value = value.label;
               }
             }
           }
@@ -1378,11 +1383,11 @@ var Easy3wFormPage = function (_Component) {
       var findObj = ''; // 只读单选字符串
       var afterBtns = _this.getAfterBtn(item);
       selectOpts = optionLst && optionLst.map(function (opt) {
-        return _react2['default'].createElement(
+        return opt.key || opt.value ? _react2['default'].createElement(
           Option,
-          { key: opt.value },
+          { key: opt.value || opt.key, disabled: opt.disabled },
           opt.label
-        );
+        ) : '';
       });
       var allContents = optionLst && optionLst.map(function (opt) {
         if (value && value instanceof Array && value.length > 0) {
@@ -1462,12 +1467,31 @@ var Easy3wFormPage = function (_Component) {
       var getFieldDecorator = form.getFieldDecorator;
 
       var disabled = false;
+      var addRules = [];
+      // 添加rule,getValueFromEvent属性
+      var decoratorObj = {
+        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+      };
+      if (cmptPros) {
+        if (cmptPros.rules) {
+          var rules = cmptPros.rules;
+
+          addRules = rules;
+          decoratorObj.rules.push(addRules);
+        }
+        if (cmptPros.getValueFromEvent) {
+          var getValueFromEvent = cmptPros.getValueFromEvent;
+
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, { getValueFromEvent: getValueFromEvent });
+        }
+      }
       if (disableFlag || cmptPros.disableFlag) {
         disabled = true;
       }
       if (allReadFlag) {
         disabled = true;
       }
+
       var cmptProsNew = (0, _extends3['default'])({}, cmptPros, { disabled: disabled });
       return _react2['default'].createElement(
         FormItem,
@@ -1477,10 +1501,9 @@ var Easy3wFormPage = function (_Component) {
           style: formItemStyle,
           className: (0, _classnames2['default'])(['formContent'])
         }),
-        getFieldDecorator(fieldId, {
-          initialValue: value,
-          rules: [{ required: required, message: requiredMessage || '\u8BF7\u9009\u62E9' + label }]
-        })(_react2['default'].createElement(RadioGroup, cmptProsNew))
+        getFieldDecorator(fieldId, (0, _extends3['default'])({}, decoratorObj, {
+          initialValue: value
+        }))(_react2['default'].createElement(RadioGroup, cmptProsNew))
       );
     }, _this.getCheckBoxColItem = function (item, formItemLayout) {
       var _this$props7 = _this.props,

package/package.json

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