easy3wui 1.5.45-beta2 → 1.5.45

package/lib/Easy3wFormPage/index.js

@@ -497,6 +497,94 @@ var Easy3wFormPage = function (_Component) {
         var noneBtn = [];
         return noneBtn;
       }
+    }, _this.getAnalysisType = function (item) {
+      var fieldType = item.fieldType;
+
+      var strRMsg = '填写'; // 必填提示文字
+      switch (fieldType) {
+        case 'autoComplete':
+          strRMsg = '填写或选择';
+          break;
+        case 'braftEditor':
+          strRMsg = '填写';
+          break;
+        case 'cascader':
+          strRMsg = '选择';
+          break;
+        case 'checkBox':
+          strRMsg = '选择';
+          break;
+        case 'monthPicker':
+          strRMsg = '选择';
+          break;
+        case 'rangePicker':
+          strRMsg = '选择';
+          break;
+        case 'datePicker':
+          strRMsg = '选择';
+          break;
+        case 'dateTimePicker':
+          strRMsg = '选择';
+          break;
+        case 'timePicker':
+          strRMsg = '选择';
+          break;
+        case 'input':
+          strRMsg = '填写';
+          break;
+        case 'mobile':
+          strRMsg = '填写';
+          break;
+        case 'textarea':
+          strRMsg = '填写';
+          break;
+        case 'numberInput':
+          strRMsg = '填写';
+          break;
+        case 'mention':
+          strRMsg = '填写或选择';
+          break;
+        case 'rate':
+          strRMsg = '选择';
+          break;
+        case 'radio':
+          strRMsg = '选择';
+          break;
+        case 'select':
+          strRMsg = '选择';
+          break;
+        case 'tagSelect':
+          strRMsg = '选择';
+          break;
+        case 'slider':
+          strRMsg = '录入';
+          break;
+        case 'switch':
+          strRMsg = '选择';
+          break;
+        case 'treeSelect':
+          strRMsg = '选择';
+          break;
+        case 'transfer':
+          strRMsg = '选择';
+          break;
+        case 'icon':
+          break;
+        case 'strTemplate':
+          strRMsg = '填写';
+          break;
+        case 'desc':
+          break;
+        case 'btn':
+          break;
+        case 'a':
+          break;
+        case 'string':
+          break;
+        default:
+          break;
+      }
+      return strRMsg;
     }, _this.getFormItem = function (item, itemValue, afterBtns, itemArea, formItemLayout) {
       var _this$props = _this.props,
           form = _this$props.form,
@@ -519,6 +607,7 @@ var Easy3wFormPage = function (_Component) {
           cmptPros = item.cmptPros;
       var fieldId = item.fieldId;
 
+      var strRMsg = _this.getAnalysisType(item);
       var addRules = [];
       var hadOnBlurFlag = false;
       var notProxyOnblurFlag = false;
@@ -547,7 +636,7 @@ var Easy3wFormPage = function (_Component) {
         addRules = [{ pattern: _comonConfig.objMobileRegular ? _comonConfig.objMobileRegular[e3wMobileNation] : objMobileRegularDefault[e3wMobileNation], message: '手机格式错误！' }].concat(addRules);
       }
       var decoratorObj = {
-        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }].concat(addRules)
+        rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }].concat(addRules)
       };
       if (fieldType === 'braftEditor') {
         var objValidator = {};
@@ -559,7 +648,7 @@ var Easy3wFormPage = function (_Component) {
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
           trigger: 'onBlur',
           validateTrigger: 'onBlur',
-          rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, objValidator)].concat(addRules)
+          rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }, objValidator)].concat(addRules)
         });
       }
       if (itemValue || itemValue === 0) {
@@ -637,12 +726,12 @@ var Easy3wFormPage = function (_Component) {
               null,
               getFieldDecorator(fieldId, {
                 initialValue: 'easy3wView',
-                rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+                rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }]
               })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
               itemValue
             ) : getFieldDecorator(fieldId, {
               initialValue: itemValue,
-              rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+              rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }]
             })(itemArea)
           );
         } else {
@@ -655,7 +744,7 @@ var Easy3wFormPage = function (_Component) {
             }),
             getFieldDecorator(fieldId, {
               initialValue: 'easy3wView',
-              rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+              rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }]
             })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
             itemValue,
             ' ',
@@ -1185,7 +1274,7 @@ var Easy3wFormPage = function (_Component) {
       });
 
       var decoratorObj = {
-        rules: [{ required: required, message: '请填写区号' }],
+        rules: [{ required: required, message: '请选择区号' }],
         initialValue: '+86'
       };
       return _react2['default'].createElement(_input2['default'], (0, _extends3['default'])({
@@ -1692,6 +1781,8 @@ var Easy3wFormPage = function (_Component) {
 
   /** 获取value */
 
+  // 判断fieldType -- 解析字段类型
+
   /** 获取FormItem */
 
   // 检验长度前转换字段值为字符串

package/lib/Easy3wGridDatePicker/index.js

@@ -73,7 +73,7 @@ var Easy3wGridDatePicker = function (_Component) {
       _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
-        rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }],
+        rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }],
         initialValue: val
       })(_react2['default'].createElement(_datePicker2['default'], (0, _extends3['default'])({
         locale: _zh_CN2['default'],

package/lib/Easy3wGridDateTimePicker/index.js

@@ -103,7 +103,7 @@ var Easy3wGridDateTimePicker = function (_Component) {
       _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
-        rules: [{ required: required, message: '\u8BF7\u586B\u5199' + label }],
+        rules: [{ required: required, message: '\u8BF7\u9009\u62E9' + label }],
         initialValue: val
       })(_react2['default'].createElement(_datePicker2['default'], (0, _extends3['default'])({
         locale: _zh_CN2['default'],

package/lib/Easy3wGridPage/index.js

@@ -264,6 +264,10 @@ var Easy3wGridPage = function (_Component) {
         }
       });
     }
+    var alertRegionFlag = false;
+    if (selRowKeysTags && selRowKeysTags instanceof Array && selRowKeysTags.length) {
+      alertRegionFlag = true;
+    }
     var alertRegion = _react2['default'].createElement(_alert2['default'], { message: _react2['default'].createElement(
         'div',
         { className: (0, _classnames2['default'])(['positionRel']) },
@@ -298,7 +302,7 @@ var Easy3wGridPage = function (_Component) {
       }, gridProps, {
         locale: { emptyText: '暂无数据' }
       })),
-      chooseFlag ? alertRegion : ''
+      chooseFlag && alertRegionFlag ? alertRegion : ''
     );
   };
 

package/package.json

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