easy3wui 1.5.9 → 1.5.10-beta1

package/lib/Easy3wGridPage/index.js

@@ -490,7 +490,19 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.numeralFormat = function (text) {
-    return (0, _numeral2['default'])(text).format('0,0.00');
+    var strText = text;
+    if (text || text === 0 || isNaN(text)) {
+      if (typeof text === 'string') {
+        strText = text;
+      } else if (typeof text === 'number') {
+        if (Number.isInfinite(text) || isNaN(NaN)) {
+          strText = text;
+        } else {
+          strText = (0, _numeral2['default'])(text).format('0,0.00');
+        }
+      }
+    }
+    return strText;
   };
 
   this.rowSelected = function (record) {

package/lib/Easy3wGridSelect/index.js

@@ -74,7 +74,9 @@ var Easy3wGridSelect = function (_Component) {
       })(_react2['default'].createElement(
         _select2['default'],
         (0, _extends3['default'])({
-          style: { minWidth: 100, width: '100%' }
+          style: { minWidth: 100, width: '100%' },
+          showSearch: true // 是否开启搜索
+          , optionFilterProp: 'children' // 搜索时过滤对应的 option 属性，如设置为 children 表示对内嵌内容进行搜索
         }, cmptPros),
         _react2['default'].createElement(
           Option,

package/lib/Easy3wGridTextArea/index.js

@@ -42,26 +42,46 @@ var Easy3wGridTextArea = function (_Component) {
   (0, _inherits3['default'])(Easy3wGridTextArea, _Component);
 
   function Easy3wGridTextArea() {
+    var _temp, _this, _ret;
+
     (0, _classCallCheck3['default'])(this, Easy3wGridTextArea);
-    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.touchTransform = function (value) {
+      var strValue = value;
+      if (typeof value === 'number') {
+        strValue = String(value);
+      }
+      return strValue;
+    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
+  // 检验长度前转换字段值为字符串
+
 
   Easy3wGridTextArea.prototype.render = function render() {
     var _props = this.props,
         fieldId = _props.fieldId,
         value = _props.value,
         form = _props.form,
-        cmptPros = _props.cmptPros,
         required = _props.required,
         requiredMessage = _props.requiredMessage,
         label = _props.label;
+    var cmptPros = this.props.cmptPros;
     var getFieldDecorator = form.getFieldDecorator;
 
     var _ref = cmptPros || {},
         maxLength = _ref.maxLength,
-        disabled = _ref.disabled;
+        disabled = _ref.disabled,
+        rows = _ref.rows;
 
-    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || 50, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 50) }];
+    var defaultMaxLength = 2000;
+    if (!rows) {
+      cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: 9999 } }, 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) {
       rules.pop();
     }
@@ -73,7 +93,7 @@ var Easy3wGridTextArea = function (_Component) {
         // valuePropName: 'defaultValue',
         initialValue: value,
         rules: rules
-      })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
+      })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({ style: { minWidth: 80 } }, cmptPros)))
     );
   };
 

package/lib/Easy3wModal/index.js

@@ -122,6 +122,7 @@ var Easy3wModal = function (_Component) {
         footer: btnObj,
         width: width,
         destroyOnClose: true,
+        maskClosable: false,
         style: { top: 20 }
       }, this.props, {
         afterClose: function afterClose() {

package/lib/Easy3wUpload/index.js

@@ -64,15 +64,15 @@ require('antd/lib/modal/style');
 
 var _comonConfig = require('comonConfigPath/comonConfig');
 
-var _Easy3wGetCookie = require('./../Easy3wGetCookie');
+var _Easy3wGetCookie = require('../Easy3wGetCookie');
 
 var _Easy3wGetCookie2 = _interopRequireDefault(_Easy3wGetCookie);
 
-var _Easy3wDownLoad = require('./../Easy3wDownLoad');
+var _Easy3wDownLoad = require('../Easy3wDownLoad');
 
 var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
 
-var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
+var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
@@ -95,9 +95,27 @@ var Easy3wUpload = function (_Component) {
       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) {
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onPreview = function (file) {
+      var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
+      var previewFileUrl = objPreviewFileNew.previewFileUrl,
+          previewFileType = objPreviewFileNew.previewFileType;
+      var uid = file.uid,
+          url = file.url,
+          name = file.name;
+
+      var fileNameArr = name.toLowerCase().split('.');
+      var fileType = fileNameArr[fileNameArr.length - 1];
+      if (previewFileType.indexOf(fileType) >= 0) {
+        var src = _this.urlDeal(previewFileUrl, uid);
+        window.open(src, '_blank');
+      } else {
+        window.open(url);
+      }
+    }, _this.urlDeal = function (urlDownloadFile, uid) {
+      var propsAFlag = _this.props.propsAFlag; // propsAFlag 加密标识 从引用组件处传入 '1':加密 '0':不加密
+
       var retUrl = '';
-      if (uid !== '' && _comonConfig.aFlag && (_comonConfig.aFlag === '1' || _comonConfig.aFlag === '2')) {
+      if (uid !== '' && propsAFlag === '1' || uid !== '' && propsAFlag !== '0' && (_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);
@@ -108,6 +126,10 @@ var Easy3wUpload = function (_Component) {
       }
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
+  // 预览
+
+  // url处理
+
 
   Easy3wUpload.prototype.render = function render() {
     var _this2 = this;
@@ -134,17 +156,20 @@ var Easy3wUpload = function (_Component) {
         extendBack = _props.extendBack,
         uploadDoneCallback = _props.uploadDoneCallback,
         removeCallback = _props.removeCallback,
-        hadUpdBtn = _props.hadUpdBtn;
+        hadUpdBtn = _props.hadUpdBtn,
+        propsAFlag = _props.propsAFlag,
+        fileViewFlag = _props.fileViewFlag;
     var warnMessage = this.props.warnMessage;
 
     var iniVal = [];
     if (initialValue) {
       iniVal = initialValue.map(function (obj) {
         var uid = obj.uid,
-            name = obj.name;
+            name = obj.name,
+            status = obj.status;
 
         var url = _this2.urlDeal(urlDownloadFile, uid);
-        return { uid: uid, name: name, url: url };
+        return { uid: uid, name: name, url: url, status: status || 'done' };
       });
     }
     var getFieldDecorator = form.getFieldDecorator;
@@ -181,7 +206,13 @@ var Easy3wUpload = function (_Component) {
       }
     };
     if (isRead) {
-      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
+      upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showDownloadIcon: true, showPreviewIcon: true, showRemoveIcon: false } });
+    }
+    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var previewFileFlag = objPreviewFileNew.previewFileFlag;
+
+    if (previewFileFlag && fileViewFlag !== false) {
+      upProps.onPreview = this.onPreview;
     }
     var beforeUpload = function beforeUpload(file) {
       // 限制上传大小
@@ -375,7 +406,9 @@ var Easy3wUpload = function (_Component) {
         pdfViewFlag: true,
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
-        downloadArr: initialValue
+        downloadArr: initialValue,
+        propsAFlag: propsAFlag,
+        fileViewFlag: fileViewFlag
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(
@@ -472,7 +505,6 @@ Easy3wUpload.defaultProps = {
   warnMessage: '',
   extend: undefined,
   extendBack: undefined,
-  hadUpdBtn: true
-};
+  hadUpdBtn: true };
 exports['default'] = Easy3wUpload;
 module.exports = exports['default'];