easy3wui 1.5.42 → 1.5.43

package/lib/Easy3wGridPage/index.js

@@ -490,7 +490,37 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.numeralFormat = function (text) {
-    return (0, _numeral2['default'])(text).format('0,0.00');
+    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;
   };
 
   this.rowSelected = function (record) {

package/lib/Easy3wUploadB/index.js

@@ -178,7 +178,8 @@ var BigFileUpload = function (_Component) {
         urlDownloadFile = _props.urlDownloadFile,
         initialValue = _props.initialValue,
         propsAFlag = _props.propsAFlag,
-        fileViewFlag = _props.fileViewFlag;
+        fileViewFlag = _props.fileViewFlag,
+        maxFileSize = _props.maxFileSize;
     var _state = this.state,
         preUploading = _state.preUploading,
         uploadPercent = _state.uploadPercent,
@@ -272,6 +273,13 @@ var BigFileUpload = function (_Component) {
           });
           return false;
         }
+        if (maxFileSize && maxFileSize > 0 && file.size / 1024 / 1024 > maxFileSize) {
+          _modal2['default'].error({
+            style: { top: '38%' },
+            content: '\u9644\u4EF6\u5FC5\u987B\u5C0F\u4E8E' + maxFileSize + 'MB!\''
+          });
+          return false;
+        }
         var multiple = _this2.props.multiple;
         var _state3 = _this2.state,
             fileList = _state3.fileList,

package/package.json

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