cloud-web-corejs 1.0.54-dev.427 → 1.0.54-dev.429

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.427",
+  "version": "1.0.54-dev.429",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/Tinymce/index.vue

@@ -217,24 +217,43 @@ export default {
         //   }, 0);
         //   return img
         // },
-        // images_upload_handler(blobInfo, success, failure, progress) {
-        //   progress(0);
-        //   const token = _this.$store.getters.token;
-        //   getToken(token).then(response => {
-        //     const url = response.data.qiniu_url;
-        //     const formData = new FormData();
-        //     formData.append('token', response.data.qiniu_token);
-        //     formData.append('key', response.data.qiniu_key);
-        //     formData.append('file', blobInfo.blob(), url);
-        //     upload(formData).then(() => {
-        //       success(url);
-        //       progress(100);
-        //     })
-        //   }).catch(err => {
-        //     failure('出现未知问题，刷新页面，或者联系程序员')
-        //     console.log(err);
-        //   });
-        // },
+        images_upload_handler(blobInfo, success, failure, progress) {
+          progress(0);
+          _this.$baseUpload.upload({
+            file:blobInfo.blob(),
+            onProgress:(e)=>{
+              progress(e.percent)
+            },
+            callback:(res)=>{
+              if(res.type=="success"){
+                let url =  res.objx.domain + res.objx.url;
+                success(url);
+                progress(100);
+              }else{
+                failure(res.content)
+              }
+            },
+            error:(e)=>{
+              failure(e.message)
+            }
+          })
+          /* progress(0);
+          const token = _this.$store.getters.token;
+          getToken(token).then(response => {
+            const url = response.data.qiniu_url;
+            const formData = new FormData();
+            formData.append('token', response.data.qiniu_token);
+            formData.append('key', response.data.qiniu_key);
+            formData.append('file', blobInfo.blob(), url);
+            upload(formData).then(() => {
+              success(url);
+              progress(100);
+            })
+          }).catch(err => {
+            failure('出现未知问题，刷新页面，或者联系程序员')
+            console.log(err);
+          }); */
+        },
       });
     },
     destroyTinymce() {