easy3wui 1.5.40 → 1.5.41-beta1

package/lib/Easy3wFormPage/index.js

@@ -204,10 +204,14 @@ var _dva = require('dva');
 
 var _easy3wui = require('easy3wui');
 
-var _comonConfig = require('comonConfigPath/comonConfig');
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+// import TagSelect from '../Easy3wTagSelect/index.js';
+// import Easy3wUpload from '../../Easy3wUpload';
+// import Easy3wUploadB from '../../Easy3wUploadB';
+// import Easy3wUploadM from '../../Easy3wUploadM';
+
+// 引入富文本表格功能
 var options = {
   defaultRows: 3, // 默认行数
   defaultColumns: 3, // 默认列数
@@ -215,12 +219,6 @@ 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');
@@ -277,32 +275,6 @@ 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);
@@ -373,8 +345,6 @@ 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':
@@ -514,10 +484,10 @@ var Easy3wFormPage = function (_Component) {
           formItemProps = item.formItemProps,
           novalueFlag = item.novalueFlag,
           label = item.label,
-          fieldId = item.fieldId,
           required = item.required,
           requiredMessage = item.requiredMessage,
           cmptPros = item.cmptPros;
+      var fieldId = item.fieldId;
 
       var addRules = [];
       var hadOnBlurFlag = false;
@@ -542,18 +512,20 @@ 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)
       };
       if (fieldType === 'braftEditor') {
+        var objValidator = {};
+        if (required) {
+          objValidator = {
+            validator: _this.validateContent
+          };
+        }
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
-          trigger: 'onBlur',
-          // validateTrigger: 'onBlur',
-          rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label, validator: _this.validateContent }].concat(addRules)
+          valuePropName: 'defaultValue',
+          rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, objValidator)].concat(addRules)
         });
       }
       if (itemValue || itemValue === 0) {
@@ -561,6 +533,20 @@ var Easy3wFormPage = function (_Component) {
           initialValue: itemValue
         });
       }
+      if (readFlag || allReadFlag) {
+        fieldId = fieldId + 'Easy3wView';
+        if (fieldType === 'braftEditor' && itemValue.isEmpty()) {
+          // 只读时，符合必填校验
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: _braftEditor2['default'].createEditorState('<p> </p>')
+          });
+        } else if (fieldType === 'textarea' && !(itemValue || itemValue === 0)) {
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: ' '
+          });
+        }
+      }
+
       if (cmptPros) {
         if (cmptPros.getValueFromEvent) {
           var getValueFromEvent = cmptPros.getValueFromEvent;
@@ -585,8 +571,7 @@ var Easy3wFormPage = function (_Component) {
           });
         }
       }
-      if ((readFlag || allReadFlag) && fieldType !== 'braftEditor') {
-        // allReadFlag
+      if ((readFlag || allReadFlag) && fieldType !== 'textarea' && fieldType !== 'braftEditor' || !label) {
         // if (fieldType === 'braftEditor') {
         //   return (
         //     <FormItem
@@ -605,7 +590,7 @@ var Easy3wFormPage = function (_Component) {
         //     </FormItem>
         //   );
         // } else if (fieldType === 'checkBox' || fieldType === 'radio') {
-        if (fieldType === 'checkBox' || fieldType === 'radio') {
+        if ((fieldType === 'checkBox' || fieldType === 'radio') && label) {
           return _react2['default'].createElement(
             FormItem,
             (0, _extends3['default'])({
@@ -1148,56 +1133,6 @@ 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;
@@ -1347,15 +1282,15 @@ var Easy3wFormPage = function (_Component) {
         _message3['default'].info('\u8F93\u5165\u5B57\u6570\u4E0D\u80FD\u8D85\u8FC7' + maxLength);
       }
     }, _this.textareaHandler = function (item) {
-      var _item$cmptPros3 = item.cmptPros,
-          cmptPros = _item$cmptPros3 === undefined ? {} : _item$cmptPros3;
+      var _item$cmptPros2 = item.cmptPros,
+          cmptPros = _item$cmptPros2 === undefined ? {} : _item$cmptPros2;
 
       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: 9999 } }, cmptPros);
+        cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: true } }, cmptPros);
       }
       return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ onChange: function onChange(e) {
           return _this.textAreaOnchange(e, maxlength);
@@ -1688,15 +1623,6 @@ var Easy3wFormPage = function (_Component) {
   /** input start */
 
   /** input end */
-  /** mobile start */
-
-  // 手机号录入框失去焦点
-
-  // 手机归属值变更
-
-  // 更新手机信息
-
-  /** mobile end */
 
   /** select start */
 

package/lib/Easy3wGridPage/index.js

@@ -490,37 +490,7 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.numeralFormat = function (text) {
-    var strText = text;
-    if (Number.isFinite(text)) {
-      // 有限值数字 用于检查一个数值是否是有限的。如果数值是有限数（即不是 Infinity、-Infinity 或 NaN），那么 Number.isFinite() 返回 true，否则返回 false。
-      strText = (0, _numeral2['default'])(text).format('0,0.00');
-    } else if (typeof text === 'string') {
-      // 字符串
-      if (/^\d+(\.\d+)?$/.test(text)) {
-        // 数字字符串
-        strText = (0, _numeral2['default'])(text).format('0,0.00');
-      } else {
-        strText = text;
-      }
-    } else {
-      strText = text;
-    }
-    // if (text || text === 0 || isNaN(text)) {
-    //   if (typeof text === 'string') {
-    //     if (/^\d+(\.\d+)?$/.test(text)) {
-    //       strText = numeral(text).format('0,0.00');
-    //     } else {
-    //       strText = text;
-    //     }
-    //   } else if (typeof text === 'number') {
-    //     if (Number.isInfinite(text) || isNaN(NaN)) {
-    //       strText = text;
-    //     } else {
-    //       strText = numeral(text).format('0,0.00');
-    //     }
-    //   }
-    // }
-    return strText;
+    return (0, _numeral2['default'])(text).format('0,0.00');
   };
 
   this.rowSelected = function (record) {

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: 9999 } }, cmptPros);
+      cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: true } }, 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.40",
+  "version": "1.5.41-beta1",
   "description": "easy3wui components for react",
   "keywords": [
     "react",