form-driver 0.3.2 → 0.3.4

package/es/m3.js

@@ -20497,9 +20497,7 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
     _this.cancleUpload = function () {
       if (_this._client) _this._client.cancel();
 
-      _this.setState({
-        loading: false
-      });
+      _this.endUpload();
     };
 
     _this.onRemove = function (file) {
@@ -20516,17 +20514,25 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
       var multipartUploadConf = _this.options.multipartUploadConf;
       var _this$state = _this.state,
           fileListStatus = _this$state.fileListStatus,
-          resList = _this$state.resList;
+          resList = _this$state.resList,
+          keyPath = _this$state.keyPath;
       return _this._client.multipartUpload(name, file, config).then(function (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
-        }]));
+        // 当所有文件上传完成后，记录了到结果，并取消loading
+        if (fileListStatus.every(function (e) {
+          return e.percent == 100;
+        })) {
+          var addArr = fileListStatus.map(function (ele) {
+            var r = ele.file;
+            r.keyPath = keyPath + "/" + ele.file.name;
+            r.name = ele.file.name;
+            r.size = ele.file.size;
+            return r;
+          });
+
+          _this.changeFileList([].concat(resList, addArr));
+
+          _this.endUpload();
+        }
       }).catch(async function (e) {
         if (e && e.name && e.name === 'cancel') {
           return;
@@ -20653,6 +20659,21 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
     }
   };
 
+  _proto.startUpload = function startUpload() {
+    this.setState({
+      loading: true
+    }); // 留下上传中的标记，为了实现上传中无法提交
+
+    localStorage["m3-plugin-ossupload-loading"] = true;
+  };
+
+  _proto.endUpload = function endUpload() {
+    this.setState({
+      loading: false
+    });
+    delete localStorage["m3-plugin-ossupload-loading"];
+  };
+
   _proto.componentWillUnmount = function componentWillUnmount() {
     window.clearInterval(this._timer); // 关闭页面的时候取消上传
 
@@ -20688,20 +20709,11 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
         var file = _ref2.file;
         // 一个个上传的
         console.log('customRequest->fileList：', file);
-
-        _this3.setState({
-          loading: true
-        });
-
         await _this3.upload(keyPath + "/" + file.name, file, _objectSpread$1({
           progress: function progress(p, checkpoint) {
             return _this3.progress(p, checkpoint, file);
           }
         }, multipartUploadConf));
-
-        _this3.setState({
-          loading: false
-        });
       },
       beforeUpload: function beforeUpload(file, fileList) {
         // 这里可以拿到上传的所有文件
@@ -20734,6 +20746,8 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
           }),
           attachmentVisible: true
         });
+
+        _this3.startUpload();
       }
     };
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Upload, _extends({

package/lib/m3.js

@@ -20519,9 +20519,7 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
     _this.cancleUpload = function () {
       if (_this._client) _this._client.cancel();
 
-      _this.setState({
-        loading: false
-      });
+      _this.endUpload();
     };
 
     _this.onRemove = function (file) {
@@ -20538,17 +20536,25 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
       var multipartUploadConf = _this.options.multipartUploadConf;
       var _this$state = _this.state,
           fileListStatus = _this$state.fileListStatus,
-          resList = _this$state.resList;
+          resList = _this$state.resList,
+          keyPath = _this$state.keyPath;
       return _this._client.multipartUpload(name, file, config).then(function (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
-        }]));
+        // 当所有文件上传完成后，记录了到结果，并取消loading
+        if (fileListStatus.every(function (e) {
+          return e.percent == 100;
+        })) {
+          var addArr = fileListStatus.map(function (ele) {
+            var r = ele.file;
+            r.keyPath = keyPath + "/" + ele.file.name;
+            r.name = ele.file.name;
+            r.size = ele.file.size;
+            return r;
+          });
+
+          _this.changeFileList([].concat(resList, addArr));
+
+          _this.endUpload();
+        }
       }).catch(async function (e) {
         if (e && e.name && e.name === 'cancel') {
           return;
@@ -20675,6 +20681,21 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
     }
   };
 
+  _proto.startUpload = function startUpload() {
+    this.setState({
+      loading: true
+    }); // 留下上传中的标记，为了实现上传中无法提交
+
+    localStorage["m3-plugin-ossupload-loading"] = true;
+  };
+
+  _proto.endUpload = function endUpload() {
+    this.setState({
+      loading: false
+    });
+    delete localStorage["m3-plugin-ossupload-loading"];
+  };
+
   _proto.componentWillUnmount = function componentWillUnmount() {
     window.clearInterval(this._timer); // 关闭页面的时候取消上传
 
@@ -20710,20 +20731,11 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
         var file = _ref2.file;
         // 一个个上传的
         console.log('customRequest->fileList：', file);
-
-        _this3.setState({
-          loading: true
-        });
-
         await _this3.upload(keyPath + "/" + file.name, file, _objectSpread$1({
           progress: function progress(p, checkpoint) {
             return _this3.progress(p, checkpoint, file);
           }
         }, multipartUploadConf));
-
-        _this3.setState({
-          loading: false
-        });
       },
       beforeUpload: function beforeUpload(file, fileList) {
         // 这里可以拿到上传的所有文件
@@ -20756,6 +20768,8 @@ var OssUpload$1 = /*#__PURE__*/function (_Viewer) {
           }),
           attachmentVisible: true
         });
+
+        _this3.startUpload();
       }
     };
     return /*#__PURE__*/React__default["default"].createElement("div", null, /*#__PURE__*/React__default["default"].createElement(antd.Upload, _extends__default["default"]({

package/package.json

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

package/src/plugins/ossUpload/OssUpload.jsx

@@ -67,7 +67,18 @@ class OssUpload extends Viewer {
 
   cancleUpload = () => {
     if (this._client) this._client.cancel();
+    this.endUpload()
+  }
+
+  startUpload() {
+    this.setState({ loading: true });
+    // 留下上传中的标记，为了实现上传中无法提交
+    localStorage["m3-plugin-ossupload-loading"] = true
+  }
+
+  endUpload() {
     this.setState({ loading: false });
+    delete localStorage["m3-plugin-ossupload-loading"]
   }
 
   componentWillUnmount() {
@@ -85,18 +96,21 @@ class OssUpload extends Viewer {
   // 自动断点续传
   upload = (name, file, config) => {
     const { multipartUploadConf } = this.options
-    const { fileListStatus, resList } = this.state
+    const { fileListStatus, resList, keyPath } = this.state
     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
-        }]);
+        // 当所有文件上传完成后，记录了到结果，并取消loading
+        if (fileListStatus.every(e => e.percent == 100)) {
+          const addArr = fileListStatus.map(ele => {
+            const r = ele.file
+            r.keyPath = `${keyPath}/${ele.file.name}`
+            r.name = ele.file.name
+            r.size = ele.file.size
+            return r
+          })
+          this.changeFileList([...resList, ...addArr]);
+          this.endUpload()
+        }
       })
       .catch(async e => {
         if (e && e.name && e.name === 'cancel') {
@@ -163,12 +177,10 @@ class OssUpload extends Viewer {
       customRequest: async ({ file }) => {
         // 一个个上传的
         console.log('customRequest->fileList：', file)
-        this.setState({ loading: true });
         await this.upload(`${keyPath}/${file.name}`, file, {
           progress: (p, checkpoint) => this.progress(p, checkpoint, file),
           ...multipartUploadConf
         })
-        this.setState({ loading: false });
       },
       beforeUpload: (file, fileList) => {
         // 这里可以拿到上传的所有文件
@@ -181,14 +193,16 @@ class OssUpload extends Viewer {
           message.error(`文件大小超过${maxSize}MB，请压缩后上传`);
           return false
         }
-        if (checkSame &&  resList.findIndex(e => e.name == file.name) >= 0) {
+        if (checkSame && resList.findIndex(e => e.name == file.name) >= 0) {
           message.error(`存在同名文件，无法上传该文件`);
           return false
         }
         this.setState({
-          fileListStatus: fileList.map(item => ({ file: item, count: 1, percent: 0 })),
+          fileListStatus: fileList.map(item => ({file: item, count: 1, percent: 0})),
           attachmentVisible: true,
         })
+        
+        this.startUpload()
       }
     };