easy3wui 1.5.7 → 1.5.8-2.beta

package/lib/Easy3wUIConfig/index.js

@@ -0,0 +1,30 @@
+'use strict';
+
+exports.__esModule = true;
+exports['default'] = {
+  objPreviewFileDefault: { // web预览文件默认配置
+    previewFileFlag: true, // 是否文件预览标志 true:是  false:否
+    // previewFileUrl: 'easy3w4fExample/download?view=true&fileId=',
+    previewFileUrl: '#/blank/EQ/route/Easy3wTranfer?fileId=', // 文件预览地址 downloadFileFlag: '1', // 显示下载按钮 '1':显示 '0':隐藏
+    previewFileType: 'pdf,doc,docx' // 可预览文件格式（以逗号隔开）
+  },
+  objReg: { // 正则表达式
+    numberRegex: /^-?(0|[1-9]\d*)(\.\d+)?([eE][-+]?\d+)?$|^Infinity$|^NaN$/i, // 匹配广义数字,包括整数、浮点数、科学计数法, 以及特殊值Infinity和NaN
+    // const testCases = [
+    //     '0',        // ✅ 合法
+    //     '123',      // ✅ 合法
+    //     '-123',     // ✅ 合法
+    //     '0.123',    // ✅ 合法
+    //     '-0.123',   // ✅ 合法
+    //     '1e3',      // ✅ 合法
+    //     '-2.5e-4',  // ✅ 合法
+    //     '0324',     // ❌ 非法（前导零）
+    //     '00.123',   // ❌ 非法（前导零）
+    //     'Infinity', // ✅ 合法
+    //     'NaN',      // ✅ 合法
+    //     'abc',      // ❌ 非法
+    // ];
+    strictNumberRegex: /^-?(0|[1-9][0-9]*)(\.[0-9]*)?$/ // 匹配严格数字, 整数、浮点数、负数, 但不包括科学计数法
+  }
+};
+module.exports = exports['default'];

package/lib/Easy3wUpload/index.js

@@ -64,23 +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;
+
+// 文件上传配置
+
+var _ref = _comonConfig.objE3wUIFileConfig || {},
+    maxSize = _ref.maxSize;
+// maxSizeB 大附件-文件大小限制 单位：MB
+// maxSize 附件-文件大小限制 单位：MB
+
+
+var _ref2 = _comonConfig.objEasy3wUIConfig || {},
+    objEasy3wUpload = _ref2.objEasy3wUpload;
+
+var _ref3 = objEasy3wUpload || {},
+    projectType = _ref3.projectType;
+
 var FormItem = _form2['default'].Item;
 var formItemStyle = {
-  marginBottom: 6
+  marginBottom: projectType === '1' ? 3 : 6
 };
 
 var Easy3wUpload = function (_Component) {
@@ -95,9 +115,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'])({}, 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);
@@ -108,6 +146,10 @@ var Easy3wUpload = function (_Component) {
       }
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
+  // 预览
+
+  // url处理
+
 
   Easy3wUpload.prototype.render = function render() {
     var _this2 = this;
@@ -119,7 +161,6 @@ var Easy3wUpload = function (_Component) {
         sendData = _props.sendData,
         listType = _props.listType,
         accept = _props.accept,
-        limitSize = _props.limitSize,
         required = _props.required,
         initialValue = _props.initialValue,
         help = _props.help,
@@ -134,17 +175,23 @@ 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 limitSize = this.props.limitSize;
+
+    limitSize = limitSize || maxSize || 200;
     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;
@@ -177,11 +224,18 @@ var Easy3wUpload = 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: { showDownloadIcon: true, showPreviewIcon: true, 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) {
       // 限制上传大小
@@ -192,7 +246,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;
       }
@@ -253,7 +307,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;
         }
@@ -335,31 +389,20 @@ var Easy3wUpload = function (_Component) {
       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);
     };
     return isRead ? _react2['default'].createElement(
       FormItem,
@@ -375,7 +418,9 @@ var Easy3wUpload = function (_Component) {
         pdfViewFlag: true,
         imgVisible: true,
         urlDownloadFile: urlDownloadFile,
-        downloadArr: initialValue
+        downloadArr: initialValue,
+        propsAFlag: propsAFlag,
+        fileViewFlag: fileViewFlag
       })),
       extendBackShowFlag ? extendBack : ''
     ) : _react2['default'].createElement(
@@ -434,13 +479,13 @@ var Easy3wUpload = function (_Component) {
 
 Easy3wUpload.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, // 上传名称
@@ -458,7 +503,7 @@ Easy3wUpload.defaultProps = {
   initialValue: [],
   listType: 'file',
   accept: '',
-  limitSize: 200,
+  // limitSizeDefault: 200,
   urlUpFileService: '',
   urlDownloadFile: '',
   buttonName: '上传',
@@ -472,7 +517,6 @@ Easy3wUpload.defaultProps = {
   warnMessage: '',
   extend: undefined,
   extendBack: undefined,
-  hadUpdBtn: true
-};
+  hadUpdBtn: true };
 exports['default'] = Easy3wUpload;
 module.exports = exports['default'];