easy3wui 1.4.41 → 1.4.92

package/lib/Easy3wLogin/index.js

@@ -18,11 +18,11 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _icons = require('@ant-design/icons');
+var _form = require('antd/lib/form');
 
-var _compatible = require('@ant-design/compatible');
+var _form2 = _interopRequireDefault(_form);
 
-require('@ant-design/compatible/assets/index.css');
+require('antd/lib/form/style');
 
 var _input = require('antd/lib/input');
 
@@ -66,6 +66,12 @@ var _autoComplete2 = _interopRequireDefault(_autoComplete);
 
 require('antd/lib/auto-complete/style');
 
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
+require('antd/lib/icon/style');
+
 var _button = require('antd/lib/button');
 
 var _button2 = _interopRequireDefault(_button);
@@ -94,7 +100,7 @@ var _Easy3wCaptcha2 = _interopRequireDefault(_Easy3wCaptcha);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var FormItem = _compatible.Form.Item;
+var FormItem = _form2['default'].Item;
 var TabPane = _tabs2['default'].TabPane;
 var Option = _select2['default'].Option;
 
@@ -253,7 +259,7 @@ var Easy3wLogin = function (_Component) {
       'div',
       { className: (0, _classnames2['default'])(['e3wLoginMain']) },
       _react2['default'].createElement(
-        _compatible.Form,
+        _form2['default'],
         { onSubmit: this.handleSubmit },
         _react2['default'].createElement(
           _tabs2['default'],
@@ -285,8 +291,7 @@ var Easy3wLogin = function (_Component) {
                     optionLabelProp: 'value'
                   },
                   _react2['default'].createElement(_input2['default'], {
-                    size: 'large',
-                    prefix: _react2['default'].createElement(_icons.UserOutlined, { className: (0, _classnames2['default'])(['e3wLoginPrefixIcon']) }),
+                    prefix: _react2['default'].createElement(_icon2['default'], { type: 'user', className: (0, _classnames2['default'])(['e3wLoginPrefixIcon']) }),
                     placeholder: userNameMessage
                   })
                 ))
@@ -300,7 +305,7 @@ var Easy3wLogin = function (_Component) {
                 }]
               })(_react2['default'].createElement(_input2['default'], {
                 size: 'large',
-                prefix: _react2['default'].createElement(_icons.UserOutlined, { className: (0, _classnames2['default'])(['e3wLoginPrefixIcon']) }),
+                prefix: _react2['default'].createElement(_icon2['default'], { type: 'user', className: (0, _classnames2['default'])(['e3wLoginPrefixIcon']) }),
                 placeholder: userNameMessage
               }))
             ),
@@ -313,7 +318,7 @@ var Easy3wLogin = function (_Component) {
                 }]
               })(_react2['default'].createElement(_input2['default'], {
                 size: 'large',
-                prefix: _react2['default'].createElement(_compatible.Icon, { type: this.state.passIcon, className: (0, _classnames2['default'])(['e3wLoginPrefixIcon']), onClick: this.changePsmode }),
+                prefix: _react2['default'].createElement(_icon2['default'], { type: this.state.passIcon, className: (0, _classnames2['default'])(['e3wLoginPrefixIcon']), onClick: this.changePsmode }),
                 type: passMode,
                 placeholder: '\u8BF7\u8F93\u5165\u5BC6\u7801'
               }))
@@ -345,7 +350,7 @@ var Easy3wLogin = function (_Component) {
                     })(_react2['default'].createElement(_input2['default'], {
                       size: 'large',
                       className: (0, _classnames2['default'])(['input']),
-                      prefix: _react2['default'].createElement(_icons.MailOutlined, { className: (0, _classnames2['default'])(['e3wLoginPrefixIcon']) }),
+                      prefix: _react2['default'].createElement(_icon2['default'], { type: 'mail', className: (0, _classnames2['default'])(['e3wLoginPrefixIcon']) }),
                       placeholder: '\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801 \u4E0D\u533A\u5206\u5927\u5C0F\u5199'
                     }))
                   ),
@@ -362,23 +367,11 @@ var Easy3wLogin = function (_Component) {
         _react2['default'].createElement(
           FormItem,
           { style: { position: 'relative' }, className: (0, _classnames2['default'])(['e3wLoginAdditional']) },
+          upLoginBtnInfo,
           _react2['default'].createElement(
-            'div',
-            { style: { lineHeight: 0 } },
-            getFieldDecorator('remember', {
-              valuePropName: 'checked',
-              initialValue: true
-            })(_react2['default'].createElement(
-              _checkbox2['default'],
-              { className: (0, _classnames2['default'])(['autoLogin']) },
-              '\u81EA\u52A8\u767B\u5F55'
-            )),
-            upLoginBtnInfo,
-            _react2['default'].createElement(
-              _button2['default'],
-              { size: 'large', loading: submitting, className: (0, _classnames2['default'])(['e3wLoginSubmit']), type: 'primary', htmlType: 'submit' },
-              '\u767B\u5F55'
-            )
+            _button2['default'],
+            { size: 'large', loading: submitting, className: (0, _classnames2['default'])(['e3wLoginSubmit']), type: 'primary', htmlType: 'submit' },
+            '\u767B\u5F55'
           )
         )
       ),

package/lib/Easy3wModal/index.js

@@ -28,8 +28,6 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _dva = require('dva');
-
 var _antd = require('antd');
 
 var _modal = require('antd/lib/modal');
@@ -38,6 +36,8 @@ var _modal2 = _interopRequireDefault(_modal);
 
 require('antd/lib/modal/style');
 
+var _dva = require('dva');
+
 var _button = require('antd/lib/button');
 
 var _button2 = _interopRequireDefault(_button);
@@ -105,7 +105,7 @@ var Easy3wModal = function (_Component) {
         title = _props.title,
         children = _props.children,
         visible = _props.visible,
-        loading = _props.loading,
+        loadingFlag = _props.loadingFlag,
         cancelHandler = _props.cancelHandler,
         onOk = _props.onOk,
         width = _props.width;
@@ -116,7 +116,7 @@ var Easy3wModal = function (_Component) {
       (0, _extends3['default'])({
         title: title,
         visible: visible,
-        confirmLoading: loading,
+        confirmLoading: loadingFlag,
         onCancel: cancelHandler,
         onOk: onOk,
         footer: btnObj,

package/lib/Easy3wPositionButton/easy3wPositionButton.less

@@ -0,0 +1,8 @@
+@import '~antd/lib/style/themes/default.less';
+
+
+.positionDiv {
+    position: absolute;
+    right: 12px;
+    top: 10px;
+}

package/lib/Easy3wPositionButton/index.js

@@ -44,7 +44,7 @@ var Easy3wPositionButton = function (_Component) {
       args[_key] = arguments[_key];
     }
 
-    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (func) {
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
       var globalLoading = _this.props.loading.global;
       if (globalLoading) {
         _notification2['default'].warning({
@@ -53,14 +53,14 @@ var Easy3wPositionButton = function (_Component) {
           duration: 3
         });
       } else {
-        func();
+        func(e);
       }
     }, _this.getOneBtnObj = function (obj, index) {
       return _react2['default'].createElement(
         'a',
         {
-          onClick: function onClick() {
-            return _this.onClickFunc(obj.func);
+          onClick: function onClick(e) {
+            return _this.onClickFunc(e, obj.func);
           },
           style: { color: obj.color ? obj.color : '', textShadow: obj.shadow ? obj.shadow : '', fontSize: obj.size ? obj.size : '' },
           type: 'primary',
@@ -83,7 +83,7 @@ var Easy3wPositionButton = function (_Component) {
     var btnObj = this.getBtnObj();
     return _react2['default'].createElement(
       'div',
-      { className: 'positionDiv' },
+      { className: (0, _classnames2['default'])(['positionDiv']) },
       btnObj
     );
   };

package/lib/Easy3wQryGrid/index.js

@@ -22,9 +22,11 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _compatible = require('@ant-design/compatible');
+var _form = require('antd/lib/form');
 
-require('@ant-design/compatible/assets/index.css');
+var _form2 = _interopRequireDefault(_form);
+
+require('antd/lib/form/style');
 
 var _input = require('antd/lib/input');
 
@@ -98,11 +100,11 @@ var _inputNumber2 = _interopRequireDefault(_inputNumber);
 
 require('antd/lib/input-number/style');
 
-var _mentions = require('antd/lib/mentions');
+var _mention = require('antd/lib/mention');
 
-var _mentions2 = _interopRequireDefault(_mentions);
+var _mention2 = _interopRequireDefault(_mention);
 
-require('antd/lib/mentions/style');
+require('antd/lib/mention/style');
 
 var _rate = require('antd/lib/rate');
 
@@ -134,6 +136,12 @@ var _transfer2 = _interopRequireDefault(_transfer);
 
 require('antd/lib/transfer/style');
 
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
+require('antd/lib/icon/style');
+
 var _button = require('antd/lib/button');
 
 var _button2 = _interopRequireDefault(_button);
@@ -166,7 +174,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'd
 
 _moment2['default'].locale('zh-cn');
 
-var FormItem = _compatible.Form.Item;
+var FormItem = _form2['default'].Item;
 var Option = _select2['default'].Option;
 
 var RadioGroup = _radio2['default'].Group;
@@ -441,7 +449,7 @@ var Easy3wQryGrid = function (_Component) {
     }, _this.mentionHandler = function (item) {
       var cmptPros = item.cmptPros;
 
-      return _react2['default'].createElement(_mentions2['default'], cmptPros);
+      return _react2['default'].createElement(_mention2['default'], cmptPros);
     }, _this.rateHandler = function (item) {
       var cmptPros = item.cmptPros;
 
@@ -543,7 +551,7 @@ var Easy3wQryGrid = function (_Component) {
         'a',
         { style: { marginLeft: 8, fontSize: 12 }, onClick: this.toggle },
         this.state.expand ? '收起' : '展开',
-        _react2['default'].createElement(_compatible.Icon, { type: this.state.expand ? 'up' : 'down' })
+        _react2['default'].createElement(_icon2['default'], { type: this.state.expand ? 'up' : 'down' })
       )
     );
     var btnArea = _react2['default'].createElement(

package/lib/Easy3wResult/index.js

@@ -6,12 +6,18 @@ var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
 
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
 var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
 
 var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
 
 exports['default'] = Easy3wResult;
 
+require('antd/lib/icon/style');
+
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -20,7 +26,7 @@ var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _icons = require('@ant-design/icons');
+var _antd = require('antd');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
@@ -34,8 +40,8 @@ function Easy3wResult(_ref) {
       restProps = (0, _objectWithoutProperties3['default'])(_ref, ['className', 'type', 'title', 'description', 'extra', 'actions']);
 
   var iconMap = {
-    error: _react2['default'].createElement(_icons.CloseCircleOutlined, { className: (0, _classnames2['default'])(['e3wResultError']) }),
-    success: _react2['default'].createElement(_icons.CheckCircleOutlined, { className: (0, _classnames2['default'])(['e3wResultSuccess']) })
+    error: _react2['default'].createElement(_icon2['default'], { className: (0, _classnames2['default'])(['e3wResultError']), type: 'close-circle' }),
+    success: _react2['default'].createElement(_icon2['default'], { className: (0, _classnames2['default'])(['e3wResultSuccess']), type: 'check-circle' })
   };
   var clsString = (0, _classnames2['default'])('e3wResult', className);
   return _react2['default'].createElement(

package/lib/Easy3wTagSelect/index.js

@@ -6,6 +6,10 @@ var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
 
+var _icon = require('antd/lib/icon');
+
+var _icon2 = _interopRequireDefault(_icon);
+
 var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
 
 var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
@@ -26,6 +30,8 @@ var _tag = require('antd/lib/tag');
 
 var _tag2 = _interopRequireDefault(_tag);
 
+require('antd/lib/icon/style');
+
 require('antd/lib/tag/style');
 
 var _react = require('react');
@@ -36,8 +42,6 @@ var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _compatible = require('@ant-design/compatible');
-
 var _antd = require('antd');
 
 var _index = require('./index.less');
@@ -213,7 +217,7 @@ var TagSelect = function (_Component) {
             { className: _index2['default'].trigger, onClick: this.handleExpand },
             expand ? '收起' : '展开',
             ' ',
-            _react2['default'].createElement(_compatible.Icon, { type: expand ? 'up' : 'down' })
+            _react2['default'].createElement(_icon2['default'], { type: expand ? 'up' : 'down' })
           )
         )
       )

package/lib/Easy3wUpload/index.js

@@ -2,22 +2,6 @@
 
 exports.__esModule = true;
 
-var _upload = require('antd/lib/upload');
-
-var _upload2 = _interopRequireDefault(_upload);
-
-var _popover = require('antd/lib/popover');
-
-var _popover2 = _interopRequireDefault(_popover);
-
-var _button = require('antd/lib/button');
-
-var _button2 = _interopRequireDefault(_button);
-
-var _modal = require('antd/lib/modal');
-
-var _modal2 = _interopRequireDefault(_modal);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -34,50 +18,101 @@ var _inherits2 = require('babel-runtime/helpers/inherits');
 
 var _inherits3 = _interopRequireDefault(_inherits2);
 
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = require('prop-types');
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+var _form = require('antd/lib/form');
+
+var _form2 = _interopRequireDefault(_form);
+
+require('antd/lib/form/style');
+
+var _upload = require('antd/lib/upload');
+
+var _upload2 = _interopRequireDefault(_upload);
+
 require('antd/lib/upload/style');
 
-require('antd/lib/popover/style');
+var _icon = require('antd/lib/icon');
 
-require('antd/lib/button/style');
+var _icon2 = _interopRequireDefault(_icon);
 
-require('antd/lib/modal/style');
+require('antd/lib/icon/style');
 
-var _react = require('react');
+var _button = require('antd/lib/button');
 
-var _react2 = _interopRequireDefault(_react);
+var _button2 = _interopRequireDefault(_button);
 
-var _propTypes = require('prop-types');
+require('antd/lib/button/style');
 
-var _propTypes2 = _interopRequireDefault(_propTypes);
+var _popover = require('antd/lib/popover');
+
+var _popover2 = _interopRequireDefault(_popover);
+
+require('antd/lib/popover/style');
 
-var _icons = require('@ant-design/icons');
+var _modal = require('antd/lib/modal');
 
-var _compatible = require('@ant-design/compatible');
+var _modal2 = _interopRequireDefault(_modal);
 
-require('@ant-design/compatible/assets/index.css');
+require('antd/lib/modal/style');
 
-var _antd = require('antd');
+var _comonConfig = require('comonConfigPath/comonConfig');
 
 var _Easy3wGetCookie = require('./../Easy3wGetCookie');
 
 var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
 
+var _Easy3wDownLoad = require('./../Easy3wDownLoad');
+
+var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
+
+var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+
+var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var FormItem = _compatible.Form.Item;
+var FormItem = _form2['default'].Item;
 var formItemStyle = {
-  marginBottom: 6
+  // marginBottom: 0,
+  margin: 3
 };
 
 var Easy3wUpload = function (_Component) {
   (0, _inherits3['default'])(Easy3wUpload, _Component);
 
   function Easy3wUpload() {
+    var _temp, _this, _ret;
+
     (0, _classCallCheck3['default'])(this, Easy3wUpload);
-    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+
+    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.urlDeal = function (urlDownloadFile, uid) {
+      var retUrl = '';
+      if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+        var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
+        var nowStr = _.now();
+        var encUrl = (0, _Easy3wAESEncrypt2['default'])(uid + '@#' + nowStr + '@#' + authToken, _comonConfig.a, _comonConfig.b);
+        return '' + urlDownloadFile + encUrl;
+      } else {
+        retUrl = '' + urlDownloadFile + uid;
+        return retUrl;
+      }
+    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
 
   Easy3wUpload.prototype.render = function render() {
+    var _this2 = this;
+
     var _props = this.props,
         urlUpFileService = _props.urlUpFileService,
         urlDownloadFile = _props.urlDownloadFile,
@@ -99,7 +134,8 @@ var Easy3wUpload = function (_Component) {
         extend = _props.extend,
         extendBack = _props.extendBack,
         uploadDoneCallback = _props.uploadDoneCallback,
-        removeCallback = _props.removeCallback;
+        removeCallback = _props.removeCallback,
+        hadUpdBtn = _props.hadUpdBtn;
     var warnMessage = this.props.warnMessage;
 
     var iniVal = [];
@@ -108,7 +144,7 @@ var Easy3wUpload = function (_Component) {
         var uid = obj.uid,
             name = obj.name;
 
-        var url = '' + urlDownloadFile + uid;
+        var url = _this2.urlDeal(urlDownloadFile, uid);
         return { uid: uid, name: name, url: url };
       });
     }
@@ -125,6 +161,7 @@ var Easy3wUpload = function (_Component) {
     if (extendBack) {
       extendBackShowFlag = true;
     }
+    var ENCFlag = '0';
     var authToken = (0, _Easy3wGetCookie2['default'])('userToken') || 'E3WSAFEAPPQWEFGHYI7I483S';
     var upProps = {
       name: uploadName,
@@ -139,6 +176,7 @@ var Easy3wUpload = function (_Component) {
         sendTime: new Date().getTime(),
         appType: '01',
         authToken: authToken,
+        ENCFlag: ENCFlag,
         sign: '2959f1aea8db0f7fbba61f0f8474d0ef',
         data: sendData
       }
@@ -155,7 +193,7 @@ var Easy3wUpload = function (_Component) {
 
       var fileNameArr = name.toLowerCase().split('.');
       var fileType = fileNameArr[fileNameArr.length - 1];
-      var acceptDefault = '.rplib,.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
+      var acceptDefault = '.msg,.rplib,.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
       if (accept && accept.length > 0) {
         acceptDefault = accept;
       }
@@ -216,7 +254,7 @@ var Easy3wUpload = function (_Component) {
         var correctTypeFlag = true;
         var fileNameArr = name.toLowerCase().split('.');
         var fileType = fileNameArr[fileNameArr.length - 1];
-        var acceptDefault = '.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
+        var acceptDefault = '.msg,.rplib,.xls,.doc,.jpg,.pdf,.png,.zip,.bmp,.rar,.txt,.docx,.ico,.bid,.xlsx,.jpeg,.json,.xml,.ebid,.dwg,.pptx,.xmind,.xps,.crx,.7z,.ppt,.svg,.pdm,.xlsm,.vsd,.gif,.tif,.docm,.csv,.ttf,.wps,.psd,.mp4,.tiff,.rtf,.tlb,.xlsb';
         if (name.length > 100) {
           return false;
         }
@@ -240,10 +278,11 @@ var Easy3wUpload = function (_Component) {
         // 2. read from response and show file link
         fileList = fileList.map(function (f1) {
           var filex = f1;
-          if (filex.response) {
-            // Component will show file.url as link
+          // Component will show file.url as link
+          if (filex.response && filex.response.data) {
             var id = filex.response.data.fileId;
-            filex.url = '' + urlDownloadFile + id;
+            var url = _this2.urlDeal(urlDownloadFile, id);
+            filex.url = url;
           }
           return filex;
         });
@@ -279,7 +318,7 @@ var Easy3wUpload = function (_Component) {
           return true;
         });
       }
-      if (file.status === 'done') {
+      if (file.status === 'done' && file.response && file.response.rspCode === '0000' && file.response.data) {
         // 处理fileList的结构
         var fileListnew = [{
           uid: file.response.data.fileId,
@@ -323,7 +362,24 @@ var Easy3wUpload = function (_Component) {
 
       callback();
     };
-    return _react2['default'].createElement(
+    return isRead ? _react2['default'].createElement(
+      FormItem,
+      {
+        label: label,
+        className: className,
+        labelCol: labelCol,
+        wrapperCol: wrapperCol,
+        style: formItemStyle
+      },
+      extendShowFlag ? extend : '',
+      getFieldDecorator('' + uploadName, {})(_react2['default'].createElement(_Easy3wDownLoad2['default'], {
+        pdfViewFlag: true,
+        imgVisible: true,
+        urlDownloadFile: urlDownloadFile,
+        downloadArr: initialValue
+      })),
+      extendBackShowFlag ? extendBack : ''
+    ) : _react2['default'].createElement(
       FormItem,
       {
         label: label,
@@ -345,7 +401,7 @@ var Easy3wUpload = function (_Component) {
         }, upProps, {
           onRemove: handleRemove
         }),
-        isRead ? null : _react2['default'].createElement(
+        _react2['default'].createElement(
           _popover2['default'],
           {
             placement: 'top',
@@ -361,13 +417,13 @@ var Easy3wUpload = function (_Component) {
             arrowPointAtCenter: true,
             style: { width: 200, height: 'auto' }
           },
-          _react2['default'].createElement(
+          hadUpdBtn ? _react2['default'].createElement(
             _button2['default'],
             null,
-            _react2['default'].createElement(_icons.UploadOutlined, null),
+            _react2['default'].createElement(_icon2['default'], { type: 'upload' }),
             ' ',
             buttonName
-          )
+          ) : ''
         )
       )),
       extendBackShowFlag ? extendBack : ''
@@ -396,7 +452,8 @@ Easy3wUpload.propTypes = {
   wrapperCol: _propTypes2['default'].object, // CSS类名
   warnMessage: _propTypes2['default'].string, // 提示
   extend: _propTypes2['default'].object, // 上传按钮之前的扩展
-  extendBack: _propTypes2['default'].object // 上传按钮之后的扩展
+  extendBack: _propTypes2['default'].object, // 上传按钮之后的扩展
+  hadUpdBtn: _propTypes2['default'].bool // 是否有上传按钮
 };
 Easy3wUpload.defaultProps = {
   initialValue: [],
@@ -415,7 +472,8 @@ Easy3wUpload.defaultProps = {
   wrapperCol: {},
   warnMessage: '',
   extend: undefined,
-  extendBack: undefined
+  extendBack: undefined,
+  hadUpdBtn: true
 };
 exports['default'] = Easy3wUpload;
 module.exports = exports['default'];