easy3wui 1.5.7 → 1.5.8-2.beta

package/lib/Easy3wUploadM/index.js

@@ -64,22 +64,43 @@ 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);
 
+var _Easy3wUIConfig = require('../Easy3wUIConfig');
+
+var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
+var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
+
+// const { previewFileUrl, previewFileFlag, previewFileType } = objPreviewFile || {};
+// 文件上传配置
+
+var _ref = _comonConfig.objE3wUIFileConfig || {},
+    maxSize = _ref.maxSize;
+// maxSizeB 大附件-文件大小限制 单位：MB
+// maxSize 附件-文件大小限制 单位：MB
+
+
+var _ref2 = _comonConfig.objEasy3wUIConfig || {},
+    objEasy3wUploadM = _ref2.objEasy3wUploadM;
+
+var _ref3 = objEasy3wUploadM || {},
+    projectType = _ref3.projectType;
+
 var formItemStyle = {
-  marginBottom: 6
+  marginBottom: projectType === '1' ? 3 : 6
 };
 
 var Easy3wUploadM = function (_Component) {
@@ -95,10 +116,32 @@ var Easy3wUploadM = function (_Component) {
     }
 
     return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.state = {
-      fileList: [{}]
+      fileList: [],
+      beforeFileList: [], // 上传前获取上传文件
+      finishFileList: [] // 上传完成文件
+
+      // 预览
+    }, _this.onPreview = function (file) {
+      var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _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);
@@ -120,7 +163,6 @@ var Easy3wUploadM = function (_Component) {
         sendData = _props.sendData,
         listType = _props.listType,
         accept = _props.accept,
-        limitSize = _props.limitSize,
         required = _props.required,
         initialValue = _props.initialValue,
         help = _props.help,
@@ -135,7 +177,12 @@ var Easy3wUploadM = function (_Component) {
         extendBack = _props.extendBack,
         uploadDoneCallback = _props.uploadDoneCallback,
         removeCallback = _props.removeCallback,
-        downloadAllFlag = _props.downloadAllFlag;
+        downloadAllFlag = _props.downloadAllFlag,
+        propsAFlag = _props.propsAFlag,
+        fileViewFlag = _props.fileViewFlag;
+    var limitSize = this.props.limitSize;
+
+    limitSize = limitSize || maxSize || 200;
     var warnMessage = this.props.warnMessage;
 
     var iniVal = [];
@@ -143,7 +190,8 @@ var Easy3wUploadM = function (_Component) {
     if (initialValue) {
       iniVal = initialValue.map(function (obj) {
         var uid = obj.uid,
-            name = obj.name;
+            name = obj.name,
+            status = obj.status;
 
         if (allivaule === '') {
           allivaule = uid;
@@ -151,7 +199,7 @@ var Easy3wUploadM = function (_Component) {
           allivaule = allivaule + ',' + uid;
         }
         var url = _this2.urlDeal(urlDownloadFile, uid);
-        return { uid: uid, name: name, url: url };
+        return { uid: uid, name: name, url: url, status: status || 'done' };
       });
     }
     if (!warnMessage) {
@@ -184,11 +232,18 @@ var Easy3wUploadM = function (_Component) {
         authToken: authToken,
         ENCFlag: ENCFlag,
         sign: '2959f1aea8db0f7fbba61f0f8474d0ef',
-        data: sendData
+        data: JSON.stringify(sendData || {}),
+        easy3wRootOrg: _comonConfig.easy3wRootOrg || ''
       }
     };
     if (isRead) {
-      upProps = (0, _extends3['default'])({}, upProps, { showUploadList: { showPreviewIcon: true, showRemoveIcon: false } });
+      upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showPreviewIcon: false, showRemoveIcon: false } });
+    }
+    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var previewFileFlag = objPreviewFileNew.previewFileFlag;
+
+    if (previewFileFlag && fileViewFlag !== false) {
+      upProps.onPreview = this.onPreview;
     }
     var beforeUpload = function beforeUpload(file) {
       // 限制上传大小
@@ -199,7 +254,7 @@ var Easy3wUploadM = 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 (name.length > 100) {
         _modal2['default'].info({
           style: { top: '38%' },
@@ -234,6 +289,11 @@ var Easy3wUploadM = function (_Component) {
         });
         return false;
       } else {
+        _this2.setState(function (prev) {
+          return (0, _extends3['default'])({}, _this2.state, {
+            beforeFileList: [].concat(prev.beforeFileList, [file])
+          });
+        });
         return true;
       }
     };
@@ -245,6 +305,7 @@ var Easy3wUploadM = function (_Component) {
     };
     var handleFileChange = function handleFileChange(e) {
       var fileList = e.fileList;
+      var file = e.file;
       // 移除大小不符、类型不符的文件
 
       fileList = fileList.filter(function (f1) {
@@ -256,7 +317,7 @@ var Easy3wUploadM = 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;
           }
@@ -287,9 +348,9 @@ var Easy3wUploadM = function (_Component) {
         return nFile;
       });
       // 3. filter successfully uploaded files according to response from server
-      fileList = fileList.filter(function (file) {
-        var status = file.status,
-            name = file.name;
+      fileList = fileList.filter(function (f3) {
+        var status = f3.status,
+            name = f3.name;
 
         if (status === 'error') {
           _modal2['default'].error({
@@ -298,17 +359,17 @@ var Easy3wUploadM = function (_Component) {
           });
           return false; // 上传失败
         }
-        if (file.response) {
-          if (file.response.rspCode === '0000') {
-            if (uploadDoneCallback) {
-              uploadDoneCallback(uploadName, fileList, file);
-            }
+        if (f3.response) {
+          if (f3.response.rspCode === '0000') {
+            // if (uploadDoneCallback) {
+            //   uploadDoneCallback(uploadName, fileList, f3);
+            // }
             return true;
           }
-          if (file.response.rspMsg) {
+          if (f3.response.rspMsg) {
             _modal2['default'].error({
               style: { top: '38%' },
-              content: file.response.rspMsg
+              content: f3.response.rspMsg
             });
           } else {
             _modal2['default'].error({
@@ -322,7 +383,7 @@ var Easy3wUploadM = function (_Component) {
         return true;
       });
       allivaule = '';
-      iniVal = fileList.map(function (obj, index) {
+      iniVal = fileList.map(function (obj) {
         var uid = obj.uid;
 
         if (allivaule === '') {
@@ -332,33 +393,41 @@ var Easy3wUploadM = function (_Component) {
         }
       });
       _this2.setState({ fileList: fileList });
+      var status = file.status;
+
+      if (status === 'done') {
+        _this2.setState(function (prev) {
+          return { finishFileList: [].concat(prev.finishFileList, [file]) };
+        }, function () {
+          var _state = _this2.state,
+              beforeFileList = _state.beforeFileList,
+              finishFileList = _state.finishFileList;
+
+          if (beforeFileList.length > 0 && finishFileList.length > 0 && beforeFileList.length === finishFileList.length) {
+            if (uploadDoneCallback) {
+              uploadDoneCallback(uploadName, fileList, file);
+              _this2.setState({ finishFileList: [], beforeFileList: [] });
+            }
+          }
+        });
+      }
       return fileList;
     };
     var checkFile = function checkFile(rule, value, callback) {
-      if (required && (!value || value.length === 0)) {
-        callback();
-        return;
-      }
-      if (value) {
-        value = value.slice(-1);
-        value = value.filter(function (file) {
-          if (file.response && file.response.rspCode === '0000') {
-            callback();
-            return true;
-          }
-          if (file.status === 'uploading') {
-            callback('  ');
-            return false;
+      var str = void 0;
+      if (value && value instanceof Array) {
+        for (var i = 0; i < value.length; i += 1) {
+          var status = value[i].status;
+
+          if (status === 'uploading') {
+            str = ' ';
+            break;
           }
-          return true;
-        });
-
-        if (required && value.length > 0) {
-          callback();
-          return;
         }
+      } else {
+        str = ' ';
       }
-      callback();
+      callback(str);
     };
     var showFlag = initialValue && initialValue.length > 1 || this.state.fileList.length > 1;
     return isRead ? _react2['default'].createElement(
@@ -375,7 +444,9 @@ var Easy3wUploadM = function (_Component) {
         pdfViewFlag: true,
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
-        downloadArr: initialValue
+        downloadArr: initialValue,
+        propsAFlag: propsAFlag,
+        fileViewFlag: fileViewFlag
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(
@@ -402,7 +473,7 @@ var Easy3wUploadM = function (_Component) {
           onRemove: handleRemove,
           multiple: true
         }),
-        _react2['default'].createElement(
+        isRead ? '' : _react2['default'].createElement(
           _popover2['default'],
           {
             placement: 'top',
@@ -441,13 +512,13 @@ var Easy3wUploadM = function (_Component) {
 
 Easy3wUploadM.propTypes = {
   uploadName: _propTypes2['default'].string.isRequired, // 上传名称
-  sendData: _propTypes2['default'].string.isRequired, // 传送数据接口
+  sendData: _propTypes2['default'].object.isRequired, // 传送数据接口
   initialValue: _propTypes2['default'].array, // 初始值
   urlUpFileService: _propTypes2['default'].string, // 后台附件服务地址
   urlDownloadFile: _propTypes2['default'].string,
   required: _propTypes2['default'].bool, // 是否必须
   help: _propTypes2['default'].string, // 后台附件服务地址
-  limitSize: _propTypes2['default'].number, // 文件大小限制
+  // limitSize: PropTypes.number, // 文件大小限制
   listType: _propTypes2['default'].string, // 附件类型
   accept: _propTypes2['default'].string, // 接受类型
   buttonName: _propTypes2['default'].string, // 上传名称
@@ -462,7 +533,7 @@ Easy3wUploadM.defaultProps = {
   initialValue: [],
   listType: 'file',
   accept: '',
-  limitSize: 200,
+  // limitSize: 200,
   urlUpFileService: '',
   urlDownloadFile: '',
   buttonName: '上传',

package/lib/index.js

@@ -290,6 +290,33 @@ Object.defineProperty(exports, 'Easy3wGridCheckBox', {
   }
 });
 
+var _Easy3wGridInputAmount = require('./Easy3wGridInputAmount');
+
+Object.defineProperty(exports, 'Easy3wGridInputAmount', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wGridInputAmount)['default'];
+  }
+});
+
+var _Easy3wGridInputDigit = require('./Easy3wGridInputDigit');
+
+Object.defineProperty(exports, 'Easy3wGridInputDigit', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wGridInputDigit)['default'];
+  }
+});
+
+var _Easy3wGridInputEmail = require('./Easy3wGridInputEmail');
+
+Object.defineProperty(exports, 'Easy3wGridInputEmail', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wGridInputEmail)['default'];
+  }
+});
+
 var _Easy3wDownLoad = require('./Easy3wDownLoad');
 
 Object.defineProperty(exports, 'Easy3wDownLoad', {
@@ -380,4 +407,58 @@ Object.defineProperty(exports, 'Easy3wAESDecrypt', {
   }
 });
 
+var _Easy3wGetDesensitization = require('./Easy3wGetDesensitization');
+
+Object.defineProperty(exports, 'Easy3wGetDesensitization', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wGetDesensitization)['default'];
+  }
+});
+
+var _Easy3wEditBigTable = require('./Easy3wEditBigTable');
+
+Object.defineProperty(exports, 'Easy3wEditBigTable', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wEditBigTable)['default'];
+  }
+});
+
+var _Easy3wTree = require('./Easy3wTree');
+
+Object.defineProperty(exports, 'Easy3wTree', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wTree)['default'];
+  }
+});
+
+var _Easy3wUIConfig = require('./Easy3wUIConfig');
+
+Object.defineProperty(exports, 'Easy3wUIConfig', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wUIConfig)['default'];
+  }
+});
+
+var _Easy3wRow = require('./Easy3wRow');
+
+Object.defineProperty(exports, 'Easy3wRow', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wRow)['default'];
+  }
+});
+
+var _Easy3wCol = require('./Easy3wCol');
+
+Object.defineProperty(exports, 'Easy3wCol', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_Easy3wCol)['default'];
+  }
+});
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.7",
+  "version": "1.5.82.beta",
   "description": "easy3wui components for react",
   "keywords": [
     "react",
@@ -104,6 +104,7 @@
     "@hanyk/rc-viewer": "^0.0.3",
     "antd": "3.24.2",
     "braft-editor": "^2.3.8",
+    "braft-extensions": "^0.1.1",
     "lodash": "4.17.11",
     "react-images": "^1.0.0",
     "react-number-format": "^4.3.1",
@@ -111,6 +112,8 @@
     "react-pdf": "^4.0.5",
     "react-zmage": "^0.8.5",
     "spark-md5": "^3.0.0",
-    "superagent": "^3.8.3"
+    "superagent": "^3.8.3",
+    "react-data-grid": "6.0.1",
+    "react-data-grid-addons": "6.0.1"
   }
 }