easy3wui 1.5.41 → 1.5.43-beta1

package/lib/Easy3wDownLoad/index.js

@@ -199,7 +199,9 @@ var Easy3wDownLoad = function (_Component) {
         fileCallURL = _props.fileCallURL;
 
     var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
-    var previewFileFlag = objPreviewFileNew.previewFileFlag;
+    var previewFileFlag = objPreviewFileNew.previewFileFlag,
+        downloadFileFlag = objPreviewFileNew.downloadFileFlag,
+        previewFileType = objPreviewFileNew.previewFileType;
 
     var retObj = '';
     if (downloadArr) {
@@ -226,7 +228,9 @@ var Easy3wDownLoad = function (_Component) {
                 name
               )
             ),
-            _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
+            downloadFileFlag === '1' ? _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
+                return _this2.touchDownload(obj, url);
+              }, style: { float: 'right', lineHeight: '100%' } }) : downloadFileFlag === '0' ? '' : previewFileType.indexOf(fileType) >= 0 ? '' : _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
                 return _this2.touchDownload(obj, url);
               }, style: { float: 'right', lineHeight: '100%' } })
           );

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/Easy3wUpload/index.js

@@ -202,7 +202,8 @@ var Easy3wUpload = function (_Component) {
         authToken: authToken,
         ENCFlag: ENCFlag,
         sign: '2959f1aea8db0f7fbba61f0f8474d0ef',
-        data: sendData
+        data: sendData,
+        easy3wRootOrg: _comonConfig.easy3wRootOrg || ''
       }
     };
     if (isRead) {

package/lib/Easy3wUploadB/index.js

@@ -530,6 +530,8 @@ var _initialiseProps = function _initialiseProps() {
     formData.append('devId', '');
     formData.append('data', JSON.stringify({ uploadParams: uploadParams }));
     formData.append('sign', '2959f1aea8db0f7fbba61f0f8474d0ef');
+    formData.append('easy3wRootOrg', _comonConfig.easy3wRootOrg || '');
+
     _superagent2['default'].post('' + urlCheckProgress).send(formData).withCredentials().end(function (err, res) {
       if (err) {
         var _state4 = _this3.state,
@@ -721,6 +723,7 @@ var _initialiseProps = function _initialiseProps() {
         formData.append('authToken', authToken);
         formData.append('data', JSON.stringify(postParam));
         formData.append('sign', '2959f1aea8db0f7fbba61f0f8474d0ef');
+        formData.append('easy3wRootOrg', _comonConfig.easy3wRootOrg || '');
         var startTime = new Date().getTime();
         _superagent2['default'].post('' + urlUpBigFileGeneral).send(formData).withCredentials().end(function (err, res) {
           if (err) {

package/lib/Easy3wUploadM/index.js

@@ -208,7 +208,8 @@ var Easy3wUploadM = function (_Component) {
         authToken: authToken,
         ENCFlag: ENCFlag,
         sign: '2959f1aea8db0f7fbba61f0f8474d0ef',
-        data: sendData
+        data: sendData,
+        easy3wRootOrg: _comonConfig.easy3wRootOrg || ''
       }
     };
     if (isRead) {

package/package.json

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