easy3wui 1.5.41-beta1 → 1.5.41-beta3

package/lib/Easy3wFormPage/index.js

@@ -204,14 +204,10 @@ var _dva = require('dva');
 
 var _easy3wui = require('easy3wui');
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+var _comonConfig = require('comonConfigPath/comonConfig');
 
-// import TagSelect from '../Easy3wTagSelect/index.js';
-// import Easy3wUpload from '../../Easy3wUpload';
-// import Easy3wUploadB from '../../Easy3wUploadB';
-// import Easy3wUploadM from '../../Easy3wUploadM';
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-// 引入富文本表格功能
 var options = {
   defaultRows: 3, // 默认行数
   defaultColumns: 3, // 默认列数
@@ -219,6 +215,12 @@ var options = {
   columnResizable: false, // 是否允许拖动调整列宽， 默认false
   exportAttrString: 'style="border: 1"' // 指定输出HTML时附加到table标签上的属性字符串
 };
+// import TagSelect from '../Easy3wTagSelect/index.js';
+// import Easy3wUpload from '../../Easy3wUpload';
+// import Easy3wUploadB from '../../Easy3wUploadB';
+// import Easy3wUploadM from '../../Easy3wUploadM';
+// 引入富文本表格功能
+
 _braftEditor2['default'].use((0, _table2['default'])(options)); // 表格
 
 _moment2['default'].locale('zh-cn');
@@ -275,6 +277,32 @@ var formItemRightWithBtn = {
 var formItemStyle = {
   marginBottom: 6
 };
+// 手机号区号及正则表  当有国家区号相同时后加区号在原本的区号基础上加 '+序号'
+var arrMobileAssociationDefault = [{ label: '中国', value: '+86', pattern: /^1[34578]\d{9}$/ }, { label: '香港', value: '+852', pattern: /^\d+$/ }, { label: '台湾', value: '+886', pattern: /^\d+$/ }, { label: '澳门', value: '+853', pattern: /^\d+$/ },
+// { label: '香港', value: '+852', pattern: /^([5|6|9])\d{7}$/ },
+// { label: '台湾', value: '+886', pattern: /^[0][9]\d{8}$/ },
+// { label: '澳门', value: '+853', pattern: /^6\d{7}$/ },
+{ label: '美国', value: '+1', pattern: /^\d+$/ }, { label: '德国', value: '+49', pattern: /^\d+$/ }, { label: '法国', value: '+33', pattern: /^\d+$/ }, { label: '英国', value: '+34', pattern: /^\d+$/ }, { label: '日本', value: '+81', pattern: /^\d+$/ }, { label: '韩国', value: '+82', pattern: /^\d+$/ }, { label: '澳大利亚', value: '+61', pattern: /^\d+$/ }, { label: '加拿大', value: '+1+0', pattern: /^\d+$/ }, { label: '印度', value: '+91', pattern: /^\d+$/ }, { label: '俄罗斯', value: '+7', pattern: /^\d+$/ }];
+// 号码正则
+var objMobileRegularDefault = {
+  '+86': /^1[34578]\d{9}$/,
+  '+852': /^\d+$/,
+  '+886': /^\d+$/,
+  '+853': /^\d+$/,
+  // '+852': /^([5|6|9])\d{7}$/,
+  // '+886': /^[0][9]\d{8}$/,
+  // '+853': /^6\d{7}$/,
+  '+1': /^\d+$/,
+  '+49': /^\d+$/,
+  '+33': /^\d+$/,
+  '+34': /^\d+$/,
+  '+81': /^\d+$/,
+  '+82': /^\d+$/,
+  '+61': /^\d+$/,
+  '+1+0': /^\d+$/,
+  '+91': /^\d+$/,
+  '+7': /^\d+$/
+};
 
 var Easy3wFormPage = function (_Component) {
   (0, _inherits3['default'])(Easy3wFormPage, _Component);
@@ -345,6 +373,8 @@ var Easy3wFormPage = function (_Component) {
           return _this.timePickerHandler(itemNew);
         case 'input':
           return _this.inputHandler(itemNew);
+        case 'mobile':
+          return _this.mobileHandler(itemNew);
         case 'textarea':
           return _this.textareaHandler(itemNew);
         // case 'inputNumber':
@@ -512,6 +542,9 @@ var Easy3wFormPage = function (_Component) {
         } else {
           addRules = [{ max: maxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + maxLength, transform: _this.touchTransform }].concat(addRules);
         }
+      } else if (fieldType === 'mobile') {
+        var e3wMobileNation = form.getFieldValue(fieldId + 'AddonBefore');
+        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)
@@ -524,7 +557,8 @@ var Easy3wFormPage = function (_Component) {
           };
         }
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
-          valuePropName: 'defaultValue',
+          trigger: 'onBlur',
+          validateTrigger: 'onBlur',
           rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, objValidator)].concat(addRules)
         });
       }
@@ -601,12 +635,12 @@ var Easy3wFormPage = function (_Component) {
             itemValue && itemValue.$$typeof ? _react2['default'].createElement(
               'div',
               null,
-              getFieldDecorator(fieldId + 'Easy3wView', {
+              getFieldDecorator(fieldId, {
                 initialValue: 'easy3wView',
                 rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
               })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
               itemValue
-            ) : getFieldDecorator(fieldId + 'Easy3wView', {
+            ) : getFieldDecorator(fieldId, {
               initialValue: itemValue,
               rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
             })(itemArea)
@@ -619,7 +653,7 @@ var Easy3wFormPage = function (_Component) {
             }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
-            getFieldDecorator(fieldId + 'Easy3wView', {
+            getFieldDecorator(fieldId, {
               initialValue: 'easy3wView',
               rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
             })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
@@ -1133,6 +1167,56 @@ var Easy3wFormPage = function (_Component) {
           cmptPros = _item$cmptPros === undefined ? {} : _item$cmptPros;
 
       return _react2['default'].createElement(_input2['default'], cmptPros);
+    }, _this.mobileHandler = function (item) {
+      var fieldId = item.fieldId,
+          required = item.required,
+          _item$cmptPros2 = item.cmptPros,
+          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
+
+      var addonBeforeCmptPros = item.addonBeforeCmptPros || {};
+      addonBeforeCmptPros = (0, _extends3['default'])({ allowClear: false, style: { minWidth: '90px' } }, addonBeforeCmptPros);
+      var itemArea = _this.selectHandler({
+        cmptPros: (0, _extends3['default'])({
+          onChange: function onChange(value) {
+            return _this.onBlurMobileNation(value, fieldId);
+          },
+          optionLst: _comonConfig.arrMobileAssociation || arrMobileAssociationDefault
+        }, addonBeforeCmptPros)
+      });
+
+      var decoratorObj = {
+        rules: [{ required: required, message: '请填写区号' }],
+        initialValue: '+86'
+      };
+      return _react2['default'].createElement(_input2['default'], (0, _extends3['default'])({
+        addonBefore: _this.props.form.getFieldDecorator(fieldId + 'AddonBefore', (0, _extends3['default'])({}, decoratorObj))(itemArea),
+        onBlur: function onBlur(e) {
+          return _this.onBlurMobile(e, fieldId);
+        }
+      }, cmptPros));
+    }, _this.onBlurMobile = function (e, fieldId) {
+      var e3wMobileNation = _this.props.form.getFieldValue(fieldId + 'AddonBefore');
+      var pattern = _comonConfig.objMobileRegular ? _comonConfig.objMobileRegular[e3wMobileNation] : objMobileRegularDefault[e3wMobileNation];
+      if (e && e.target && e.target.value && e3wMobileNation && pattern.test(e.target.value)) {
+        _this.updateMobileInfo(e.target.value, e3wMobileNation);
+      }
+    }, _this.onBlurMobileNation = function (value, fieldId) {
+      var e3wMobile = _this.props.form.getFieldValue(fieldId);
+      var pattern = _comonConfig.objMobileRegular ? _comonConfig.objMobileRegular[value] : objMobileRegularDefault[value];
+      if (e3wMobile && value && pattern.test(e3wMobile)) {
+        _this.updateMobileInfo(e3wMobile, value);
+      }
+    }, _this.updateMobileInfo = function (e3wMobile, e3wMobileNation) {
+      var xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = function () {
+        if (xhr.readyState === 4 && xhr.status === 200) {
+          // 请求成功，处理响应数据
+        }
+      };
+      var data = JSON.stringify({ e3wMobile: e3wMobile, e3wMobileNation: e3wMobileNation });
+      xhr.open('POST', _comonConfig.easy3w4fMobileLibUpdateUrl, true); // 异步请求
+      xhr.setRequestHeader('Content-Type', 'application/json'); // 设置请求头
+      xhr.send(data); // 发送请求
     }, _this.selectHandler = function (item) {
       var cmptPros = item.cmptPros;
       var optionLst = cmptPros.optionLst;
@@ -1282,15 +1366,15 @@ var Easy3wFormPage = function (_Component) {
         _message3['default'].info('\u8F93\u5165\u5B57\u6570\u4E0D\u80FD\u8D85\u8FC7' + maxLength);
       }
     }, _this.textareaHandler = function (item) {
-      var _item$cmptPros2 = item.cmptPros,
-          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
+      var _item$cmptPros3 = item.cmptPros,
+          cmptPros = _item$cmptPros3 === undefined ? {} : _item$cmptPros3;
 
       var maxlength = void 0;
       if (cmptPros.maxLength || cmptPros.maxlength) {
         maxlength = cmptPros.maxLength || cmptPros.maxlength;
       }
       if (!cmptPros.rows) {
-        cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: true } }, cmptPros);
+        cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: 9999 } }, cmptPros);
       }
       return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ onChange: function onChange(e) {
           return _this.textAreaOnchange(e, maxlength);
@@ -1488,7 +1572,8 @@ var Easy3wFormPage = function (_Component) {
       return _react2['default'].createElement(_autoComplete2['default'], cmptPros);
     }, _this.braftEditorHandler = function (item) {
       var allReadFlag = _this.props.allReadFlag;
-      var readFlag = item.readFlag;
+      var readFlag = item.readFlag,
+          fieldId = item.fieldId;
       var cmptPros = item.cmptPros;
 
       cmptPros = (0, _extends3['default'])({}, cmptPros);
@@ -1497,7 +1582,15 @@ var Easy3wFormPage = function (_Component) {
       if (readFlag || allReadFlag || cmptPros && cmptPros.readOnly) {
         cmptPros.controls = [];
       }
-      return _react2['default'].createElement(_braftEditor2['default'], (0, _extends3['default'])({ readOnly: readFlag || allReadFlag }, cmptPros, { style: { border: '1px solid #eee' } }));
+      return _react2['default'].createElement(_braftEditor2['default'], (0, _extends3['default'])({ readOnly: readFlag || allReadFlag, onChange: function onChange(value) {
+          return _this.onChangeBraftEditor(fieldId, value);
+        } }, cmptPros, { style: { border: '1px solid #eee' } }));
+    }, _this.onChangeBraftEditor = function (fieldId, value) {
+      if (value && value.toHTML() !== '<p></p>') {
+        var _this$props$form$setF3;
+
+        _this.props.form.setFieldsValue((_this$props$form$setF3 = {}, _this$props$form$setF3[fieldId] = value, _this$props$form$setF3));
+      }
     }, _this.validateContent = function (rule, value, callback) {
       if (value.isEmpty()) {
         callback(rule.message);
@@ -1623,6 +1716,15 @@ var Easy3wFormPage = function (_Component) {
   /** input start */
 
   /** input end */
+  /** mobile start */
+
+  // 手机号录入框失去焦点
+
+  // 手机归属值变更
+
+  // 更新手机信息
+
+  /** mobile end */
 
   /** select start */
 
@@ -1715,6 +1817,8 @@ var Easy3wFormPage = function (_Component) {
 
   /** braftEditor start */
 
+  // BraftEditor数据变更
+
   // 文章内容校验
 
   /** braftEditor end */

package/lib/Easy3wGridTextArea/index.js

@@ -79,7 +79,7 @@ var Easy3wGridTextArea = function (_Component) {
 
     var defaultMaxLength = 2000;
     if (!rows) {
-      cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: true } }, cmptPros);
+      cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: 9999 } }, cmptPros);
     }
     var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || defaultMaxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || defaultMaxLength), transform: this.touchTransform }];
     if (disabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.41-beta1",
+  "version": "1.5.41-beta3",
   "description": "easy3wui components for react",
   "keywords": [
     "react",