form-driver 0.3.0 → 0.3.2

package/es/m3.js

@@ -20518,10 +20518,12 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
           fileListStatus = _this$state.fileListStatus,
           resList = _this$state.resList;
       return _this._client.multipartUpload(name, file, config).then(function (res) {
-        console.log('this._client.multipartUpload: result:', res); // 单个上传成功, 记录了到结果
+        console.log('this._client.multipartUpload: result:', res);
+        console.log('this._client.multipartUpload: file:', file); // 单个上传成功, 记录了到结果
 
         _this.changeFileList([].concat(resList, [{
           uid: file.uid,
+          size: file.size,
           name: file.name,
           keyPath: res.name
         }]));
@@ -20607,6 +20609,9 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
       srcFormat: function srcFormat(src) {
         return src;
       },
+      maxAmount: 50,
+      maxSize: 1000,
+      checkSame: false,
       multipartUploadConf: {
         parallel: 3,
         partSize: 1024 * 1024 * 2,
@@ -20666,6 +20671,8 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
         multipartUploadConf = _this$options.multipartUploadConf,
         maxSize = _this$options.maxSize,
         maxAmount = _this$options.maxAmount;
+        _this$options.showSize;
+        var checkSame = _this$options.checkSame;
     var _this$state2 = this.state,
         loading = _this$state2.loading,
         fileListStatus = _this$state2.fileListStatus,
@@ -20710,8 +20717,14 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
           return false;
         }
 
+        if (checkSame && resList.findIndex(function (e) {
+          return e.name == file.name;
+        }) >= 0) {
+          message.error("\u5B58\u5728\u540C\u540D\u6587\u4EF6\uFF0C\u65E0\u6CD5\u4E0A\u4F20\u8BE5\u6587\u4EF6");
+          return false;
+        }
+
         _this3.setState({
-          fileList: fileList,
           fileListStatus: fileList.map(function (item) {
             return {
               file: item,
@@ -20752,7 +20765,6 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
               _this3.cancleUpload();
 
               _this3.setState({
-                fileList: [],
                 fileListStatus: [],
                 attachmentVisible: false
               });
@@ -20760,7 +20772,6 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
           });
         } else {
           _this3.setState({
-            fileList: [],
             fileListStatus: [],
             attachmentVisible: false
           });
@@ -20849,6 +20860,21 @@ var OssUploadType = _.assign({}, EmtpyType, {
   }
 });
 
+function bytesToSize(bytes, fixNum) {
+  if (fixNum === void 0) {
+    fixNum = 1;
+  }
+
+  var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+  var i = Math.floor(Math.log(bytes) / Math.log(1024));
+
+  if (sizes[i]) {
+    return (bytes / Math.pow(1024, i)).toFixed(fixNum) + ' ' + sizes[i];
+  } else {
+    return '';
+  }
+}
+
 var OssUploadViewer = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose(OssUploadViewer, _BaseViewer);
 
@@ -20866,7 +20892,7 @@ var OssUploadViewer = /*#__PURE__*/function (_BaseViewer) {
       }, /*#__PURE__*/React.createElement("a", {
         target: '_blank',
         href: i.url
-      }, i.name));
+      }, i.name), "  ", i.size ? /*#__PURE__*/React.createElement("span", null, " ", bytesToSize(i.size)) : "", " ");
     }));
   };
 

package/lib/m3.js

@@ -20540,10 +20540,12 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
           fileListStatus = _this$state.fileListStatus,
           resList = _this$state.resList;
       return _this._client.multipartUpload(name, file, config).then(function (res) {
-        console.log('this._client.multipartUpload: result:', res); // 单个上传成功, 记录了到结果
+        console.log('this._client.multipartUpload: result:', res);
+        console.log('this._client.multipartUpload: file:', file); // 单个上传成功, 记录了到结果
 
         _this.changeFileList([].concat(resList, [{
           uid: file.uid,
+          size: file.size,
           name: file.name,
           keyPath: res.name
         }]));
@@ -20629,6 +20631,9 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
       srcFormat: function srcFormat(src) {
         return src;
       },
+      maxAmount: 50,
+      maxSize: 1000,
+      checkSame: false,
       multipartUploadConf: {
         parallel: 3,
         partSize: 1024 * 1024 * 2,
@@ -20688,6 +20693,8 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
         multipartUploadConf = _this$options.multipartUploadConf,
         maxSize = _this$options.maxSize,
         maxAmount = _this$options.maxAmount;
+        _this$options.showSize;
+        var checkSame = _this$options.checkSame;
     var _this$state2 = this.state,
         loading = _this$state2.loading,
         fileListStatus = _this$state2.fileListStatus,
@@ -20732,8 +20739,14 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
           return false;
         }
 
+        if (checkSame && resList.findIndex(function (e) {
+          return e.name == file.name;
+        }) >= 0) {
+          antd.message.error("\u5B58\u5728\u540C\u540D\u6587\u4EF6\uFF0C\u65E0\u6CD5\u4E0A\u4F20\u8BE5\u6587\u4EF6");
+          return false;
+        }
+
         _this3.setState({
-          fileList: fileList,
           fileListStatus: fileList.map(function (item) {
             return {
               file: item,
@@ -20774,7 +20787,6 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
               _this3.cancleUpload();
 
               _this3.setState({
-                fileList: [],
                 fileListStatus: [],
                 attachmentVisible: false
               });
@@ -20782,7 +20794,6 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
           });
         } else {
           _this3.setState({
-            fileList: [],
             fileListStatus: [],
             attachmentVisible: false
           });
@@ -20871,6 +20882,21 @@ var OssUploadType = ___default["default"].assign({}, EmtpyType, {
   }
 });
 
+function bytesToSize(bytes, fixNum) {
+  if (fixNum === void 0) {
+    fixNum = 1;
+  }
+
+  var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+  var i = Math.floor(Math.log(bytes) / Math.log(1024));
+
+  if (sizes[i]) {
+    return (bytes / Math.pow(1024, i)).toFixed(fixNum) + ' ' + sizes[i];
+  } else {
+    return '';
+  }
+}
+
 var OssUploadViewer = /*#__PURE__*/function (_BaseViewer) {
   _inheritsLoose__default["default"](OssUploadViewer, _BaseViewer);
 
@@ -20888,7 +20914,7 @@ var OssUploadViewer = /*#__PURE__*/function (_BaseViewer) {
       }, /*#__PURE__*/React__default["default"].createElement("a", {
         target: '_blank',
         href: i.url
-      }, i.name));
+      }, i.name), "  ", i.size ? /*#__PURE__*/React__default["default"].createElement("span", null, " ", bytesToSize(i.size)) : "", " ");
     }));
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-driver",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "An efficient framework for creating forms.",
   "license": "MIT",
   "authors": [

package/src/plugins/ossUpload/OssUpload.jsx

@@ -5,7 +5,6 @@ import { CloseOutlined, CaretRightOutlined } from '@ant-design/icons';
 import { Ajax, Viewer } from "../../index";
 import './index.less';
 
-
 class OssUpload extends Viewer {
   constructor(p) {
     super(p);
@@ -25,6 +24,9 @@ class OssUpload extends Viewer {
       changeHandle: () => { },
       resFormat: res => res,
       srcFormat: src => src,
+      maxAmount: 50,
+      maxSize: 1000,
+      checkSame: false,
       multipartUploadConf: {
         parallel: 3,
         partSize: 1024 * 1024 * 2,
@@ -87,9 +89,11 @@ class OssUpload extends Viewer {
     return this._client.multipartUpload(name, file, config)
       .then(res => {
         console.log('this._client.multipartUpload: result:', res)
+        console.log('this._client.multipartUpload: file:', file)
         // 单个上传成功, 记录了到结果
         this.changeFileList([...resList, {
           uid: file.uid,
+          size: file.size,
           name: file.name,
           keyPath: res.name
         }]);
@@ -148,7 +152,7 @@ class OssUpload extends Viewer {
   }
 
   element() {
-    const { multiple = false, accept = '', multipartUploadConf, maxSize, maxAmount } = this.options
+    const { multiple = false, accept = '', multipartUploadConf, maxSize, maxAmount, showSize = false, checkSame } = this.options
     const { loading, fileListStatus, keyPath, attachmentVisible, resList } = this.state
 
     // 上传配置
@@ -177,8 +181,11 @@ class OssUpload extends Viewer {
           message.error(`文件大小超过${maxSize}MB，请压缩后上传`);
           return false
         }
+        if (checkSame &&  resList.findIndex(e => e.name == file.name) >= 0) {
+          message.error(`存在同名文件，无法上传该文件`);
+          return false
+        }
         this.setState({
-          fileList,
           fileListStatus: fileList.map(item => ({ file: item, count: 1, percent: 0 })),
           attachmentVisible: true,
         })
@@ -207,7 +214,6 @@ class OssUpload extends Viewer {
                     onOk: () => {
                       this.cancleUpload()
                       this.setState({
-                        fileList: [],
                         fileListStatus: [],
                         attachmentVisible: false
                       })
@@ -215,7 +221,6 @@ class OssUpload extends Viewer {
                   })
                 } else {
                   this.setState({
-                    fileList: [],
                     fileListStatus: [],
                     attachmentVisible: false
                   })

package/src/plugins/ossUpload/OssUploadViewer.tsx

@@ -1,6 +1,17 @@
 import React from "react";
 import { BaseViewer } from "../../index";
 
+// 字节友好展示
+export function bytesToSize(bytes, fixNum = 1) {
+  var sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+  var i = Math.floor(Math.log(bytes) / Math.log(1024));
+  if (sizes[i]) {
+    return (bytes / Math.pow(1024, i)).toFixed(fixNum) + ' ' + sizes[i];
+  } else {
+    return ''
+  }
+}
+
 class OssUploadViewer extends BaseViewer {
   [x: string]: any;
   element() {
@@ -8,7 +19,7 @@ class OssUploadViewer extends BaseViewer {
     return <div>
       {
         arr.map(i => {
-          return <div key={i.uid}><a target='_blank' href={i.url}>{i.name}</a></div>
+          return <div key={i.uid}><a target='_blank' href={i.url}>{i.name}</a>  {i.size ? <span> {bytesToSize(i.size)}</span> : ""} </div>
         })
       }
     </div>

package/types/plugins/ossUpload/OssUploadViewer.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { BaseViewer } from "../../index";
+export declare function bytesToSize(bytes: any, fixNum?: number): string;
 declare class OssUploadViewer extends BaseViewer {
     [x: string]: any;
     element(): JSX.Element;