easy3wui 1.5.14 → 1.5.17

package/lib/Easy3wDownLoad/index.js

@@ -125,9 +125,8 @@ var Easy3wDownLoad = function (_Component) {
       _this.setState({ imageViewURL: '' });
     };
 
-    _this.onPreview = function (file) {
+    _this.onPreview = function (file, url) {
       var uid = file.uid,
-          url = file.url,
           name = file.name;
 
       var fileNameArr = name.toLowerCase().split('.');
@@ -136,17 +135,34 @@ var Easy3wDownLoad = function (_Component) {
         var src = _this.urlDeal(previewFileUrl, uid);
         window.open(src, '_blank');
       } else {
-        window.open(url);
+        // window.open(url);
+        var _a = document.createElement('a');
+        _a.setAttribute('href', url);
+        _a.setAttribute('target', '_blank');
+        _a.setAttribute('id', 'downReportFile');
+        document.body.appendChild(_a);
+        if (!document.getElementById('downReportFile')) {
+          document.body.appendChild(_a);
+        }
+        _a.click();
       }
     };
 
-    _this.touchDownload = function (file) {
+    _this.touchDownload = function (file, url) {
       var uid = file.uid,
-          url = file.url,
           name = file.name;
       // const src = this.urlDeal(previewFileUrl, uid);
-
-      window.open(url);
+      // window.open(url);
+
+      var a = document.createElement('a');
+      a.setAttribute('href', url);
+      a.setAttribute('target', '_blank');
+      a.setAttribute('id', 'downReportFile');
+      document.body.appendChild(a);
+      if (!document.getElementById('downReportFile')) {
+        document.body.appendChild(a);
+      }
+      a.click();
     };
 
     _this.state = {
@@ -189,20 +205,20 @@ var Easy3wDownLoad = function (_Component) {
           // 预览
           return _react2['default'].createElement(
             'div',
-            { style: { width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between' } },
+            { style: { width: '100%', display: 'flex', alignItems: 'center' } },
             _react2['default'].createElement(
               _tooltip2['default'],
               { placement: 'topLeft', title: name, style: { whiteSpace: 'pre-wrap', wordWrap: 'break-word' } },
               _react2['default'].createElement(
                 'a',
                 { onClick: function onClick() {
-                    return _this2.onPreview(obj);
-                  }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis' } },
+                    return _this2.onPreview(obj, url);
+                  }, style: { overflow: 'hidden', whiteSpace: 'nowrap', textOverflow: 'ellipsis', paddingRight: '12px' } },
                 name
               )
             ),
             _react2['default'].createElement(_icon2['default'], { type: 'download', onClick: function onClick() {
-                return _this2.touchDownload(obj);
+                return _this2.touchDownload(obj, url);
               }, style: { float: 'right', lineHeight: '100%' } })
           );
         } else if (previwPdfFlag && fileType.indexOf('pdf') >= 0) {

package/lib/Easy3wFormPage/index.js

@@ -1205,6 +1205,7 @@ var Easy3wFormPage = function (_Component) {
 
       return _react2['default'].createElement(_inputNumber2['default'], cmptPros);
     }, _this.inputNumberFormatHandler = function (item, formItemLayout) {
+      var allReadFlag = _this.props.allReadFlag;
       var getFieldDecorator = _this.props.form.getFieldDecorator;
       var cmptPros = item.cmptPros,
           label = item.label,
@@ -1213,7 +1214,8 @@ var Easy3wFormPage = function (_Component) {
           required = item.required,
           value = item.value,
           disableFlag = item.disableFlag,
-          formItemProps = item.formItemProps;
+          formItemProps = item.formItemProps,
+          readFlag = item.readFlag;
 
       var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
       if (cmptPros && cmptPros.rules) {
@@ -1222,6 +1224,23 @@ var Easy3wFormPage = function (_Component) {
         addrules.push.apply(addrules, rules);
       }
       var afterBtns = _this.getAfterBtn(item);
+      if (readFlag || allReadFlag) {
+        return _react2['default'].createElement(
+          FormItem,
+          (0, _extends3['default'])({
+            label: label
+          }, formItemLayout, formItemProps, {
+            style: formItemStyle
+          }),
+          getFieldDecorator(fieldId + 'Easy3wView', {
+            initialValue: 'easy3wView',
+            rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+          })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
+          value,
+          ' ',
+          afterBtns
+        );
+      }
       return _react2['default'].createElement(
         FormItem,
         (0, _extends3['default'])({

package/package.json

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