easy3wui 1.5.37-beta1 → 1.5.37

package/lib/Easy3wFormPage/index.js

@@ -278,12 +278,13 @@ var formItemStyle = {
   marginBottom: 6
 };
 // 手机号区号及正则表  当有国家区号相同时后加区号在原本的区号基础上加 '+序号'
-var arrMobileAssociation = [{ label: '中国', value: '+86', pattern: /^1[34578]\d{9}$/ }, { label: '香港', value: '+852', pattern: /^\d+$/ }, { label: '台湾', value: '+886', pattern: /^\d+$/ }, { label: '澳门', value: '+853', pattern: /^\d+$/ },
+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 objMobileRegular = {
+// 号码正则
+var objMobileRegularDefault = {
   '+86': /^1[34578]\d{9}$/,
   '+852': /^\d+$/,
   '+886': /^\d+$/,
@@ -542,12 +543,9 @@ var Easy3wFormPage = function (_Component) {
           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 mobileAddonBefore = form.getFieldValue('mobileAddonBefore');
-        // console.log('mobileAddonBefore', mobileAddonBefore, objMobileRegular[mobileAddonBefore]);
-        // objMobileRegular[mobileAddonBefore]
-        addRules = [{ pattern: objMobileRegular[mobileAddonBefore], message: '手机格式错误！' }].concat(addRules);
+        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)
       };
@@ -1158,7 +1156,7 @@ var Easy3wFormPage = function (_Component) {
 
       var addonBeforeCmptPros = item.addonBeforeCmptPros || {};
       addonBeforeCmptPros = (0, _extends3['default'])({ allowClear: false, style: { minWidth: '90px' } }, addonBeforeCmptPros);
-      var itemArea = _this.selectHandler({ cmptPros: (0, _extends3['default'])({ optionLst: arrMobileAssociation }, addonBeforeCmptPros) });
+      var itemArea = _this.selectHandler({ cmptPros: (0, _extends3['default'])({ optionLst: _comonConfig.arrMobileAssociation || arrMobileAssociationDefault }, addonBeforeCmptPros) });
 
       var decoratorObj = {
         rules: [{ required: required, message: '请填写区号' }],
@@ -1171,17 +1169,18 @@ var Easy3wFormPage = function (_Component) {
         }
       }, cmptPros));
     }, _this.onBlurMobile = function (e, fieldId) {
-      var mobileAreaCode = _this.props.form.getFieldValue(fieldId + 'AddonBefore');
-      if (e && e.target && e.target.value && mobileAreaCode) {
+      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)) {
         var xhr = new XMLHttpRequest();
         xhr.onreadystatechange = function () {
           if (xhr.readyState === 4 && xhr.status === 200) {
             // 请求成功，处理响应数据
           }
         };
-        var data = JSON.stringify({ e3wMobile: e.target.value, e3wMobileNation: mobileAreaCode });
-        xhr.open("POST", _comonConfig.easy3w4fMobileLibUpdateUrl, true); // 异步请求
-        xhr.setRequestHeader("Content-Type", "application/json"); // 设置请求头
+        var data = JSON.stringify({ e3wMobile: e.target.value, e3wMobileNation: e3wMobileNation });
+        xhr.open('POST', _comonConfig.easy3w4fMobileLibUpdateUrl, true); // 异步请求
+        xhr.setRequestHeader('Content-Type', 'application/json'); // 设置请求头
         xhr.send(data); // 发送请求
       }
     }, _this.selectHandler = function (item) {

package/package.json

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